- gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: testenv: use --autoreconf-in-src-copy by default
by osmith 07 Mar '25

07 Mar '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39735?usp=email ) Change subject: testenv: use --autoreconf-in-src-copy by default ...................................................................... testenv: use --autoreconf-in-src-copy by default Pass --autoreconf-in-src-copy to osmo-dev's gen_makefile.py by default, so we can always avoid errors related to: * running "./configure" in-tree and out-of-tree (results in "configure: error: source directory already configured; run "make distclean" there first") * running "./configure" / "autoreconf" with different autotools versions (on host system and in podman container) I've kept is as experimental flag at first for better testing, but make it the default now as it seems to work reliably. The old make dir is cleaned up when the user runs "./testenv.py clean" the next time. Related: osmo-dev I18ac50e3441df81e1fe7d8d5321df7e80ab9c650 Change-Id: I41e1fb534e253ddb43f266d73485b83259a8aa40 --- M _testenv/testenv/__init__.py M _testenv/testenv/osmo_dev.py M _testenv/testenv/requirements.py 3 files changed, 9 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/39735/1 diff --git a/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py index 4a925bb..c1991ca 100644 --- a/_testenv/testenv/__init__.py +++ b/_testenv/testenv/__init__.py @@ -170,14 +170,6 @@ default=ccache_dir_default, ) - group = sub_run.add_argument_group("experimental options") - group.add_argument( - "-A", - "--autoreconf-in-src-copy", - action="store_true", - help="run autoreconf in a copy of the source dir, avoids 'run make distclean' errors", - ) - sub.add_parser("clean", help="clean previous build artifacts") args = parser.parse_args() diff --git a/_testenv/testenv/osmo_dev.py b/_testenv/testenv/osmo_dev.py index 8748b93..695ca0d 100644 --- a/_testenv/testenv/osmo_dev.py +++ b/_testenv/testenv/osmo_dev.py @@ -73,14 +73,10 @@ os.path.join(testenv.args.cache, "host/usr"), ] - if testenv.args.autoreconf_in_src_copy: - # Use a different make dir, so we don't have unexpected behavior when - # the user already ran autoreconf or ./configure through osmo-dev with - # the previous make dir, without --autoreconf-in-src-copy. - make_dir += "2" - extra_opts += [ - "--autoreconf-in-src-copy", - ] + # Make dirs created without passing --autoreconf-in-src-copy to + # gen_makefile.py (as previous versions of testenv did) are incompatible. + # Add the "2" to avoid potential conflicts. + make_dir += "2" cmd = [ "./gen_makefile.py", @@ -103,6 +99,7 @@ "no_systemd.opts", "werror.opts", os.path.join(testenv.data_dir, "osmo-dev/osmo-bts-trx.opts"), + "--autoreconf-in-src-copy", ] + extra_opts cwd = get_osmo_dev_dir() diff --git a/_testenv/testenv/requirements.py b/_testenv/testenv/requirements.py index 4973f6e..5405f50 100644 --- a/_testenv/testenv/requirements.py +++ b/_testenv/testenv/requirements.py @@ -44,6 +44,10 @@ "lddtree", "qemu-system-x86_64", ] + if not testenv.args.binary_repo: + programs += [ + "rsync", + ] abort = False for program in programs: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39735?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I41e1fb534e253ddb43f266d73485b83259a8aa40 Gerrit-Change-Number: 39735 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-mgw[master]: mgw: Early reject CRCX with X-Osmux if disabled by config
by pespin 07 Mar '25

07 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39714?usp=email ) Change subject: mgw: Early reject CRCX with X-Osmux if disabled by config ...................................................................... mgw: Early reject CRCX with X-Osmux if disabled by config This new behavior rejects the CRCX before creating a conn, simplifying the code and also allows getting rid of the remote_osmux_cid local variable. Change-Id: I0245b6c02bf7a3452532e8bf0d7c33479999ce9f --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 19 insertions(+), 16 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 916a284..ce397c8 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -817,7 +817,6 @@ struct mgcp_parse_hdr_pars *hpars = &pdata->hpars; struct rate_ctr_group *rate_ctrs; int error_code = 400; - int remote_osmux_cid; struct mgcp_conn *conn = NULL; struct mgcp_conn_rtp *conn_rtp = NULL; char conn_name[512]; @@ -892,13 +891,22 @@ } } - remote_osmux_cid = hpars->remote_osmux_cid; - /* If osmux is disabled, just skip setting it up */ - if (trunk->cfg->osmux.usage == OSMUX_USAGE_OFF) - remote_osmux_cid = MGCP_PARSE_HDR_PARS_OSMUX_CID_UNSET; + /* Reject osmux if disabled by config */ + if (trunk->cfg->osmux.usage == OSMUX_USAGE_OFF && + hpars->remote_osmux_cid != MGCP_PARSE_HDR_PARS_OSMUX_CID_UNSET) { + LOGPENDP(endp, DLMGCP, LOGL_ERROR, "CRCX: Request with Osmux but it is disabled by config!\n"); + rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_NO_OSMUX)); + return create_err_response(endp, endp, 511, "CRCX", pdata->trans); + } + /* Reject non-osmux if required by config */ + if (trunk->cfg->osmux.usage == OSMUX_USAGE_ONLY && + hpars->remote_osmux_cid == MGCP_PARSE_HDR_PARS_OSMUX_CID_UNSET) { + LOGPENDP(endp, DLMGCP, LOGL_ERROR, "CRCX: Request without Osmux but it is required by config!\n"); + return create_err_response(endp, endp, 517, "CRCX", pdata->trans); + } /* Make sure osmux is setup: */ - if (remote_osmux_cid != MGCP_PARSE_HDR_PARS_OSMUX_CID_UNSET) + if (hpars->remote_osmux_cid != MGCP_PARSE_HDR_PARS_OSMUX_CID_UNSET) mgcp_trunk_osmux_init_if_needed(trunk); /* Check if we are able to accept the creation of another connection */ @@ -970,21 +978,16 @@ conn_rtp = mgcp_conn_get_conn_rtp(conn); OSMO_ASSERT(conn_rtp); - /* If X-Osmux (remote CID) was received (-1 is wilcard), alloc next avail CID as local CID */ - if (remote_osmux_cid >= -1) { + /* If X-Osmux (remote CID) was received, alloc next avail CID as local CID */ + if (hpars->remote_osmux_cid != MGCP_PARSE_HDR_PARS_OSMUX_CID_UNSET) { if (osmux_init_conn(conn_rtp) < 0) { rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_NO_OSMUX)); goto error2; } - if (remote_osmux_cid >= 0) { + if (hpars->remote_osmux_cid >= 0) { conn_rtp->osmux.remote_cid_present = true; - conn_rtp->osmux.remote_cid = remote_osmux_cid; - } - } else if (endp->trunk->cfg->osmux.usage == OSMUX_USAGE_ONLY) { - LOGPCONN(conn, DLMGCP, LOGL_ERROR, - "CRCX: osmux only and no osmux offered\n"); - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_NO_OSMUX)); - goto error2; + conn_rtp->osmux.remote_cid = hpars->remote_osmux_cid; + } /* else: -1 (wildcard) */ } /* Set local connection options, if present */ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39714?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I0245b6c02bf7a3452532e8bf0d7c33479999ce9f Gerrit-Change-Number: 39714 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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>

1 0

[XS] Change in osmo-mgw[master]: cosmetic: Drop incorrect comment
by pespin 07 Mar '25

07 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39713?usp=email ) Change subject: cosmetic: Drop incorrect comment ...................................................................... cosmetic: Drop incorrect comment The writer of this commit wrongly interpreted conn->end to be an mgcp_endpoint, but it's actually an struct mgcp_rtp_end, hence codecs are set per connection as expected. Change-Id: I773065972342b8cedc900e3d194c48775c3adb5a --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 34b0111..916a284 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1009,7 +1009,6 @@ goto error2; } /* Upgrade the conn type RTP_DEFAULT->RTP_IUUP if needed based on requested codec: */ - /* TODO: "codec" probably needs to be moved from endp to conn */ if (conn_rtp->type == MGCP_RTP_DEFAULT && strcmp(conn_rtp->end.cset.codec->subtype_name, "VND.3GPP.IUFP") == 0) { rc = mgcp_conn_iuup_init(conn_rtp); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39713?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I773065972342b8cedc900e3d194c48775c3adb5a Gerrit-Change-Number: 39713 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-mgw[master]: mgw: Early reject CRCX with X-Osmux if disabled by config
by osmith 07 Mar '25

07 Mar '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39714?usp=email ) Change subject: mgw: Early reject CRCX with X-Osmux if disabled by config ...................................................................... Patch Set 1: (1 comment) File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/c/osmo-mgw/+/39714/comment/ebf00936_7b07777c?usp… : PS1, Line 898: rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_NO_OSMUX)); > Leaving it here: […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39714?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I0245b6c02bf7a3452532e8bf0d7c33479999ce9f Gerrit-Change-Number: 39714 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Mar 2025 14:00:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-mgw[master]: mgw: Split MGCP LocalConnectionOptions parsing from updating endpoint
by osmith 07 Mar '25

07 Mar '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39723?usp=email ) Change subject: mgw: Split MGCP LocalConnectionOptions parsing from updating endpoint ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39723?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If75731fb92329dca6d092ffc7ff17cb354d28c0d Gerrit-Change-Number: 39723 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Mar 2025 13:58:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-mgw[master]: mgw: Allocate req and pdata with talloc
by osmith 07 Mar '25

07 Mar '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39722?usp=email ) Change subject: mgw: Allocate req and pdata with talloc ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39722?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2b971d0c8268f4c0a30b84b54a2e5f16ada4ecdb Gerrit-Change-Number: 39722 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Mar 2025 13:55:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-mgw[master]: mgw: Use tall_mgw_ctx to allocate struct mgcp_config
by osmith 07 Mar '25

07 Mar '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39721?usp=email ) Change subject: mgw: Use tall_mgw_ctx to allocate struct mgcp_config ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39721?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib51f1066bb73da4472bd8967cc1b1c44e964e9e5 Gerrit-Change-Number: 39721 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Mar 2025 13:53:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-mgw[master]: mgw: Add backpointer from pdata to req to have context available
by osmith 07 Mar '25

07 Mar '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39720?usp=email ) Change subject: mgw: Add backpointer from pdata to req to have context available ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39720?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I464258ca1a8817d58ae5c5426dfc3b7cee6763d3 Gerrit-Change-Number: 39720 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Mar 2025 13:52:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-mgw[master]: mgw: Move cfg pointer from pdata to rq
by osmith 07 Mar '25

07 Mar '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39719?usp=email ) Change subject: mgw: Move cfg pointer from pdata to rq ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39719?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie64fb6250cc84f1e7737b5c1cf5cca314c7020ed Gerrit-Change-Number: 39719 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Mar 2025 13:50:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-mgw[master]: mgw: Move struct mgcp_request_data definition to header file
by osmith 07 Mar '25

07 Mar '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39718?usp=email ) Change subject: mgw: Move struct mgcp_request_data definition to header file ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39718?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I1b2831874c1aaad054ad19bf87646062ba9d4da4 Gerrit-Change-Number: 39718 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Mar 2025 13:48:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log