- gerrit-log - lists.osmocom.org

[XS] Change in osmo-ttcn3-hacks[master]: Revert "testenv: use eclipse-titan 11 in Dockerfile"

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40419?usp=email ) Change subject: Revert "testenv: use eclipse-titan 11 in Dockerfile" ...................................................................... Revert "testenv: use eclipse-titan 11 in Dockerfile" We had a lot of fallout from this, revert to version 9.0.0 for now. This reverts commit 8082d099e3f96da3dfe4348b0e1bd794d93b8b02. Related: OS#6490 Change-Id: I0a00fd4e031410be102cd6e99ecab4a464503003 --- M _testenv/data/podman/Dockerfile 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/40419/1 diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index 9d43cbc..dca8a75 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -4,7 +4,7 @@ # Arguments used after FROM must be specified again ARG OSMOCOM_REPO_TESTSUITE_MIRROR="https://downloads.osmocom.org" -ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/packages/osmocom:/nightly/Debian_12/" +ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/packages/osmocom:/latest/Debian_12/" # Copy from common dir COPY obs.key /obs.key @@ -140,9 +140,9 @@ pip3 install ./osmo-python-tests --break-system-packages && \ rm -rf osmo-python-tests -# Add eclipse-titan from osmocom:nightly, invalidate cache when :nightly changes +# Add eclipse-titan from osmocom:latest, invalidate cache when :latest changes RUN echo "deb [signed-by=/obs.key] $OSMOCOM_REPO ./" \ - > /etc/apt/sources.list.d/osmocom-nightly.list + > /etc/apt/sources.list.d/osmocom-latest.list ADD $OSMOCOM_REPO/Release /tmp/Release RUN set -x && \ apt-get update && \ @@ -150,7 +150,7 @@ eclipse-titan \ && \ apt-get clean && \ - rm /etc/apt/sources.list.d/osmocom-nightly.list + rm /etc/apt/sources.list.d/osmocom-latest.list # Add mongodb for open5gs-hss. Using the package from bullseye since bookworm # mongodb-org package is not available. Furthermore, manually install required -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40419?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: I0a00fd4e031410be102cd6e99ecab4a464503003 Gerrit-Change-Number: 40419 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

3 weeks, 3 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: msc: add TC_lu_and_ussd_notify_during_mt_call

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40410?usp=email ) Change subject: msc: add TC_lu_and_ussd_notify_during_mt_call ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40410?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6935ad96aef7747c576505ae52f8b5d3e0611882 Gerrit-Change-Number: 40410 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 03 Jun 2025 06:16:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks, 3 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: Makefile: add global per-project clean target

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40409?usp=email ) Change subject: Makefile: add global per-project clean target ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40409?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I434ecbe3f3dd25ea770d8f2d7adfa62c67dc0c1d Gerrit-Change-Number: 40409 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 03 Jun 2025 06:12:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks, 3 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: Makefile: add global per-project clean target

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40409?usp=email ) Change subject: Makefile: add global per-project clean target ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40409?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I434ecbe3f3dd25ea770d8f2d7adfa62c67dc0c1d Gerrit-Change-Number: 40409 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 03 Jun 2025 06:12:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks, 3 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: allow passing -j/--jobs together with -b/--binary-repo

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40418?usp=email ) Change subject: testenv: allow passing -j/--jobs together with -b/--binary-repo ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: ah yes, those should not have been mutually exclusive. thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40418?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3eb596f2c4e5de1b624c238e34785e798d2099c3 Gerrit-Change-Number: 40418 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 03 Jun 2025 06:10:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

3 weeks, 3 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: allow passing -j/--jobs together with -b/--binary-repo

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40418?usp=email ) Change subject: testenv: allow passing -j/--jobs together with -b/--binary-repo ...................................................................... testenv: allow passing -j/--jobs together with -b/--binary-repo Not only the -j/--jobs is used when building the IUT components, but also when building the testsuite itself (PARALLEL_MAKE var). Change-Id: I3eb596f2c4e5de1b624c238e34785e798d2099c3 --- M _testenv/testenv/__init__.py 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/40418/1 diff --git a/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py index 6118b65..9b5e944 100644 --- a/_testenv/testenv/__init__.py +++ b/_testenv/testenv/__init__.py @@ -87,7 +87,6 @@ group.add_argument("-i", "--io-uring", action="store_true", help="set LIBOSMO_IO_BACKEND=IO_URING") group = sub_run.add_argument_group("source/binary options", "All components are built from source by default.") - group = group.add_mutually_exclusive_group() group.add_argument( "-b", "--binary-repo", -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40418?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: I3eb596f2c4e5de1b624c238e34785e798d2099c3 Gerrit-Change-Number: 40418 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

3 weeks, 3 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library/MGCP_Emulation: Fix Dynamic test case error returning unbound...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40417?usp=email ) Change subject: library/MGCP_Emulation: Fix Dynamic test case error returning unbound value ...................................................................... library/MGCP_Emulation: Fix Dynamic test case error returning unbound value As spotted today while running HNBGW_Tests.TC_rab_assignment, probably after upgrade to titan 11: 17:54:36.223786 1570 MGCP_Emulation.ttcn:241 Dynamic test case error: Copying an unbound charstring value. The error happened because in that failure path the component running the function was not stopped, and hence an unset variable was returned. Hence, make sure we tear everything down (including component going through the failure path). Change-Id: Id1d28924e90ed80199b61a143dac35fc6f50de68 --- M library/MGCP_Emulation.ttcn 1 file changed, 29 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/40417/1 diff --git a/library/MGCP_Emulation.ttcn b/library/MGCP_Emulation.ttcn index 7106f63..8dd3d3f 100644 --- a/library/MGCP_Emulation.ttcn +++ b/library/MGCP_Emulation.ttcn @@ -35,6 +35,7 @@ import from MGCP_Templates all; import from Osmocom_Types all; import from IPL4asp_Types all; +import from Misc_Helpers all; type component MGCP_ConnHdlr { /* Simple send/recv without caring about peer addr+port. Used with multi_conn_mode=false. */ @@ -149,8 +150,9 @@ return MgcpEndpointTable[i].comp_ref; } } - setverdict(fail, "MGCP Endpoint Table not found by Endpoint", ep); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("MGCP Endpoint Table not found by Endpoint", ep)); + return MgcpEndpointTable[0].comp_ref; /* Make compiler happy returning something */ } private function f_ep_by_comp(MGCP_ConnHdlr client) @@ -161,8 +163,9 @@ return MgcpEndpointTable[i].endpoint; } } - setverdict(fail, "MGCP Endpoint Table not found by component ", client); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("MGCP Endpoint Table not found by component ", client)); + return MgcpEndpointTable[0].endpoint; /* Make compiler happy returning something */ } private function f_ep_table_add(MGCP_ConnHdlr comp_ref, MgcpEndpoint ep) @@ -175,7 +178,7 @@ return; } } - testcase.stop("MGCP Endpoint Table full!"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "MGCP Endpoint Table full!"); } private function f_ep_table_del(MGCP_ConnHdlr comp_ref, MgcpEndpoint ep) @@ -189,8 +192,8 @@ return; } } - setverdict(fail, "MGCP Endpoint Table: Couldn't find to-be-deleted entry!"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("MGCP Endpoint Table: Couldn't find to-be-deleted entry!")); } private function f_ep_table_change_connhdlr(MGCP_ConnHdlr comp_ref, MgcpEndpoint ep) @@ -203,8 +206,8 @@ return; } } - setverdict(fail, "MGCP Endpoint Table: Couldn't find entry to move to ", comp_ref); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("MGCP Endpoint Table: Couldn't find entry to move to ", comp_ref)); } /* Check if the given transaction ID is a pending CRCX. If yes, return true + remove */ @@ -235,8 +238,8 @@ } else { var MgcpEndpoint ep; if (f_mgcp_find_param(msg, "Z", ep) == false) { - setverdict(fail, "No SpecificEndpointName in MGCP response", msg); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("No SpecificEndpointName in MGCP response", msg)); } return ep; } @@ -280,8 +283,8 @@ res := MGCP_CodecPort_CtrlFunct.f_IPL4_connect(MGCP, p.callagent_ip, p.callagent_udp_port, p.mgw_ip, p.mgw_udp_port, -1, { udp:={} }); } if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect MGCP socket, check your configuration"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Could not connect MGCP socket, check your configuration")); } g_mgcp_conn_id := res.connId; @@ -329,8 +332,8 @@ p.callagent_udp_port := mrf.remPort; res := MGCP_CodecPort_CtrlFunct.f_IPL4_connect(MGCP, p.callagent_ip, p.callagent_udp_port, p.mgw_ip, p.mgw_udp_port, g_mgcp_conn_id, { udp:={} }); if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect MGCP socket, check your configuration"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Could not connect MGCP socket, check your configuration")); } } if (ischosen(mrf.msg.command)) { @@ -358,8 +361,8 @@ } } } else { - setverdict(fail, "Received unexpected MGCP response: ", mrf.msg.response); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Received unexpected MGCP response: ", mrf.msg.response)); } } [] MGCP_PROC.getcall(MGCPEM_register:{?,?}) -> param(crit, vc_conn) { @@ -448,8 +451,9 @@ return ret; } } - setverdict(fail, "Couldn't find Expect for CRCX", cmd); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Couldn't find Expect for CRCX", cmd)); + return MgcpExpectTable[0].vc_conn; /* Make compiler happy returning something */ } private function f_create_expect(ExpectCriteria crit, MGCP_ConnHdlr hdlr) @@ -459,8 +463,8 @@ /* Check an entry like this is not already present */ for (i := 0; i < sizeof(MgcpExpectTable); i := i+1) { if (crit == MgcpExpectTable[i].crit) { - setverdict(fail, "Crit already present", crit); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Crit already present", crit)); } } for (i := 0; i < sizeof(MgcpExpectTable); i := i+1) { @@ -471,7 +475,7 @@ return; } } - testcase.stop("No space left in MgcpExpectTable") + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "No space left in MgcpExpectTable"); } /* client/conn_hdlr side function to use procedure port to create expect in emulation */ @@ -528,8 +532,9 @@ return "AMR-WB"; } - setverdict(fail, "Unknown payload type ", pt); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Unknown payload type ", pt)); + return ""; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40417?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: Id1d28924e90ed80199b61a143dac35fc6f50de68 Gerrit-Change-Number: 40417 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

3 weeks, 3 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: use eclipse-titan 11 in Dockerfile

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40381?usp=email ) Change subject: testenv: use eclipse-titan 11 in Dockerfile ...................................................................... testenv: use eclipse-titan 11 in Dockerfile Install eclipse-titan from osmocom:nightly instead of osmocom:latest, which now has version 11. Once we ensured everything works as expected, we will upgrade the version in osmocom:latest too. Change-Id: I660dd6ca93a54087b1d41787c4ed2b64a3ad0437 --- M _testenv/data/podman/Dockerfile 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index dca8a75..9d43cbc 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -4,7 +4,7 @@ # Arguments used after FROM must be specified again ARG OSMOCOM_REPO_TESTSUITE_MIRROR="https://downloads.osmocom.org" -ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/packages/osmocom:/latest/Debian_12/" +ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/packages/osmocom:/nightly/Debian_12/" # Copy from common dir COPY obs.key /obs.key @@ -140,9 +140,9 @@ pip3 install ./osmo-python-tests --break-system-packages && \ rm -rf osmo-python-tests -# Add eclipse-titan from osmocom:latest, invalidate cache when :latest changes +# Add eclipse-titan from osmocom:nightly, invalidate cache when :nightly changes RUN echo "deb [signed-by=/obs.key] $OSMOCOM_REPO ./" \ - > /etc/apt/sources.list.d/osmocom-latest.list + > /etc/apt/sources.list.d/osmocom-nightly.list ADD $OSMOCOM_REPO/Release /tmp/Release RUN set -x && \ apt-get update && \ @@ -150,7 +150,7 @@ eclipse-titan \ && \ apt-get clean && \ - rm /etc/apt/sources.list.d/osmocom-latest.list + rm /etc/apt/sources.list.d/osmocom-nightly.list # Add mongodb for open5gs-hss. Using the package from bullseye since bookworm # mongodb-org package is not available. Furthermore, manually install required -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40381?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I660dd6ca93a54087b1d41787c4ed2b64a3ad0437 Gerrit-Change-Number: 40381 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 weeks, 3 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: use eclipse-titan 11 in Dockerfile

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40381?usp=email ) Change subject: testenv: use eclipse-titan 11 in Dockerfile ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > (unresolve comment) Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40381?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I660dd6ca93a54087b1d41787c4ed2b64a3ad0437 Gerrit-Change-Number: 40381 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 02 Jun 2025 12:22:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

3 weeks, 3 days

1
0
0 0

[XS] Change in libosmocore[master]: osmo_io: Keep msgb ownership internal during segmentation until read_cb

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/40369?usp=email ) Change subject: osmo_io: Keep msgb ownership internal during segmentation until read_cb ...................................................................... osmo_io: Keep msgb ownership internal during segmentation until read_cb Until dispatched to the user over read_cb(), the msgb is considered to be not-ready-for-user and hence it's kept owned by the iofd. This resembles more the actual expected parentship tree, since iofd->pending is freed by osmo_io internally in osmo_iofd_close(). More importat, which should cause less trouble if for instance user of osmo_iofd wishes to reparent the osmo_io and then free the previous ctx it passed during osmo_iofd_setup(). Change-Id: I4f41153948b7f1568c7499db53b9620bf2dd9ac4 --- M src/core/osmo_io.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified jolly: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 9d377a8..aaf7bcc 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -343,6 +343,7 @@ OSMO_ASSERT(iofd->mode == OSMO_IO_FD_MODE_READ_WRITE); if (rc <= 0) { + talloc_steal(iofd->msgb_alloc.ctx, msg); iofd->io_ops.read_cb(iofd, rc, msg); return; } @@ -354,6 +355,7 @@ /* It it expected as per API spec that we return the * return value of read here. The amount of bytes in msg is * available to the user in msg itself. */ + talloc_steal(iofd->msgb_alloc.ctx, msg); iofd->io_ops.read_cb(iofd, rc, msg); /* The user could unregister/close the iofd during read_cb() above. * Once that's done, it doesn't expect to receive any more events, @@ -378,15 +380,16 @@ * \param[in] hdr serialized msghdr containing state of completed I/O */ void iofd_handle_recv(struct osmo_io_fd *iofd, struct msgb *msg, int rc, struct iofd_msghdr *hdr) { - talloc_steal(iofd->msgb_alloc.ctx, msg); switch (iofd->mode) { case OSMO_IO_FD_MODE_READ_WRITE: iofd_handle_segmented_read(iofd, msg, rc); break; case OSMO_IO_FD_MODE_RECVFROM_SENDTO: + talloc_steal(iofd->msgb_alloc.ctx, msg); iofd->io_ops.recvfrom_cb(iofd, rc, msg, &hdr->osa); break; case OSMO_IO_FD_MODE_RECVMSG_SENDMSG: + talloc_steal(iofd->msgb_alloc.ctx, msg); iofd->io_ops.recvmsg_cb(iofd, rc, msg, &hdr->hdr); break; default: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40369?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: I4f41153948b7f1568c7499db53b9620bf2dd9ac4 Gerrit-Change-Number: 40369 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 weeks, 3 days

1
0
0 0

2025

2024

2023

2022

gerrit-log