November 2024 - gerrit-log - lists.osmocom.org

[M] Change in libosmo-sigtran[master]: sigtran: Add public APIs to manage struct osmo_ss7_user

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38727?usp=email ) Change subject: sigtran: Add public APIs to manage struct osmo_ss7_user ...................................................................... sigtran: Add public APIs to manage struct osmo_ss7_user Change-Id: I81b424239e9f7d4dc84bf167053f784ad2e8ca49 --- M TODO-RELEASE M include/osmocom/sigtran/osmo_ss7.h M src/Makefile.am A src/osmo_ss7_user.c M src/sccp_internal.h M src/sccp_user.c M tests/ss7/ss7_test.c 7 files changed, 102 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/27/38727/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 08978d4..a8b60f1 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -14,3 +14,4 @@ libosmo-sigtran add API osmo_ss7_instance_get_id(), osmo_ss7_instance_get_name(), osmo_ss7_instance_get_pc_fmt(), osmo_ss7_instance_get_primary_pc(), osmo_ss7_get_sccp() libosmo-sigtran add API osmo_ss7_instances_llist_entry() libosmo-sigtran add API osmo_ss7_as_get_asp_protocol(), osmo_ss7_as_select_asp() +libosmo-sigtran add API osmo_ss7_user: create(), get_instance(), set_prim_cb(), set_priv(), get_priv() diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 361e715..ccf2247 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -128,9 +128,16 @@ void *priv; }; +struct osmo_ss7_user *osmo_ss7_user_create(struct osmo_ss7_instance *inst, const char *name); +void osmo_ss7_user_destroy(struct osmo_ss7_user *user); + +struct osmo_ss7_instance *osmo_ss7_user_get_instance(const struct osmo_ss7_user *user); +void osmo_ss7_user_set_prim_cb(struct osmo_ss7_user *user, osmo_prim_cb prim_cb); +void osmo_ss7_user_set_priv(struct osmo_ss7_user *user, void *priv); +void *osmo_ss7_user_get_priv(const struct osmo_ss7_user *user); + int osmo_ss7_user_register(struct osmo_ss7_instance *inst, uint8_t service_ind, struct osmo_ss7_user *user); - int osmo_ss7_user_unregister(struct osmo_ss7_instance *inst, uint8_t service_ind, struct osmo_ss7_user *user); diff --git a/src/Makefile.am b/src/Makefile.am index 78e9764..44e6c34 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,6 +46,7 @@ osmo_ss7_xua_srv.c \ osmo_ss7_route.c \ osmo_ss7_route_table.c \ + osmo_ss7_user.c \ sccp2sua.c \ sccp_helpers.c \ sccp_lbcs.c \ diff --git a/src/osmo_ss7_user.c b/src/osmo_ss7_user.c new file mode 100644 index 0000000..3aea3a9 --- /dev/null +++ b/src/osmo_ss7_user.c @@ -0,0 +1,71 @@ +/* (C) 2015-2017 by Harald Welte <laforge(a)gnumonks.org> + * (C) 2023-2024 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <errno.h> + +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/prim.h> +#include <osmocom/sigtran/osmo_ss7.h> + +#include "ss7_internal.h" + +/*********************************************************************** + * MTP Users (Users of MTP, such as SCCP or ISUP) + ***********************************************************************/ + +struct osmo_ss7_user *osmo_ss7_user_create(struct osmo_ss7_instance *inst, const char *name) +{ + struct osmo_ss7_user *user; + user = talloc_zero(inst, struct osmo_ss7_user); + if (!user) + return NULL; + + user->inst = inst; + user->name = talloc_strdup(user, name ? : ""); + return user; +} + +void osmo_ss7_user_destroy(struct osmo_ss7_user *user) +{ + talloc_free(user); +} + +struct osmo_ss7_instance *osmo_ss7_user_get_instance(const struct osmo_ss7_user *user) +{ + return user->inst; +} + +void osmo_ss7_user_set_prim_cb(struct osmo_ss7_user *user, osmo_prim_cb prim_cb) +{ + user->prim_cb = prim_cb; +} + +void osmo_ss7_user_set_priv(struct osmo_ss7_user *user, void *priv) +{ + user->priv = priv; +} + +void *osmo_ss7_user_get_priv(const struct osmo_ss7_user *user) +{ + return user->priv; +} diff --git a/src/sccp_internal.h b/src/sccp_internal.h index 0367fe1..dedcdcd 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -48,7 +48,7 @@ struct osmo_ss7_instance *ss7; void *priv; - struct osmo_ss7_user ss7_user; + struct osmo_ss7_user *ss7_user; struct osmo_tdef *tdefs; diff --git a/src/sccp_user.c b/src/sccp_user.c index 4f94bf8..2cd5315 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -235,10 +235,6 @@ inst->priv = priv; INIT_LLIST_HEAD(&inst->users); - inst->ss7_user.inst = ss7; - inst->ss7_user.name = "SCCP"; - inst->ss7_user.prim_cb = mtp_user_prim_cb; - inst->ss7_user.priv = inst; inst->max_optional_data = SCCP_MAX_OPTIONAL_DATA; inst->tdefs = talloc_memdup(inst, osmo_sccp_timer_defaults, @@ -251,7 +247,10 @@ return NULL; } - osmo_ss7_user_register(ss7, MTP_SI_SCCP, &inst->ss7_user); + inst->ss7_user = osmo_ss7_user_create(ss7, "SCCP"); + osmo_ss7_user_set_prim_cb(inst->ss7_user, mtp_user_prim_cb); + osmo_ss7_user_set_priv(inst->ss7_user, inst); + osmo_ss7_user_register(ss7, MTP_SI_SCCP, inst->ss7_user); llist_add_tail(&inst->list, &sccp_instances); @@ -263,7 +262,9 @@ struct osmo_sccp_user *scu, *scu2; inst->ss7->sccp = NULL; - osmo_ss7_user_unregister(inst->ss7, MTP_SI_SCCP, &inst->ss7_user); + osmo_ss7_user_unregister(inst->ss7, MTP_SI_SCCP, inst->ss7_user); + osmo_ss7_user_destroy(inst->ss7_user); + inst->ss7_user = NULL; llist_for_each_entry_safe(scu, scu2, &inst->users, list) { osmo_sccp_user_unbind(scu); diff --git a/tests/ss7/ss7_test.c b/tests/ss7/ss7_test.c index 7d4ec5f..5211fe6 100644 --- a/tests/ss7/ss7_test.c +++ b/tests/ss7/ss7_test.c @@ -98,7 +98,7 @@ static void test_user(void) { - struct osmo_ss7_user user, user2; + struct osmo_ss7_user *user, *user2; struct osmo_mtp_prim omp = { .oph = { .sap = MTP_SAP_USER, @@ -111,13 +111,16 @@ }; printf("Testing SS7 user\n"); + user = osmo_ss7_user_create(s7i, "testuser"); + osmo_ss7_user_set_prim_cb(user, test_user_prim_cb); + osmo_ss7_user_set_priv(user, (void *) 0x1234); - user.name = "testuser"; - user.priv = (void *) 0x1234; - user.prim_cb = test_user_prim_cb; + user2 = osmo_ss7_user_create(s7i, "testuser_notregistered"); + osmo_ss7_user_set_prim_cb(user, test_user_prim_cb); + osmo_ss7_user_set_priv(user, (void *) 0x1234); /* registration */ - OSMO_ASSERT(osmo_ss7_user_register(s7i, 1, &user) == 0); + OSMO_ASSERT(osmo_ss7_user_register(s7i, 1, user) == 0); OSMO_ASSERT(osmo_ss7_user_register(s7i, 1, NULL) == -EBUSY); OSMO_ASSERT(osmo_ss7_user_register(s7i, 255, NULL) == -EINVAL); @@ -127,8 +130,8 @@ /* cleanup */ OSMO_ASSERT(osmo_ss7_user_unregister(s7i, 255, NULL) == -EINVAL); OSMO_ASSERT(osmo_ss7_user_unregister(s7i, 10, NULL) == -ENODEV); - OSMO_ASSERT(osmo_ss7_user_unregister(s7i, 1, &user2) == -EINVAL); - OSMO_ASSERT(osmo_ss7_user_unregister(s7i, 1, &user) == 0); + OSMO_ASSERT(osmo_ss7_user_unregister(s7i, 1, user2) == -EINVAL); + OSMO_ASSERT(osmo_ss7_user_unregister(s7i, 1, user) == 0); /* primitive delivery should fail now */ OSMO_ASSERT(osmo_ss7_mtp_to_user(s7i, &omp) == -ENODEV); @@ -136,6 +139,9 @@ /* wrong primitive delivery should also fail */ omp.oph.primitive = OSMO_MTP_PRIM_PAUSE; OSMO_ASSERT(osmo_ss7_mtp_to_user(s7i, &omp) == -EINVAL); + + osmo_ss7_user_destroy(user); + osmo_ss7_user_destroy(user2); } static void test_route(void) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38727?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I81b424239e9f7d4dc84bf167053f784ad2e8ca49 Gerrit-Change-Number: 38727 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: Fix sporadic failure in .TC_ho_in_fail_ipa_crcx_timeout

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38726?usp=email ) Change subject: bsc: Fix sporadic failure in .TC_ho_in_fail_ipa_crcx_timeout ...................................................................... bsc: Fix sporadic failure in .TC_ho_in_fail_ipa_crcx_timeout The code path was not waiting to receive DLCX if parameter ignore_mgw_mdcx was set to false. It should wait for DLCX in any case. Since it didn't wait, te ConnHdlr would finish earlier than expected and MGCP_Emulation would fail when forwarding the DLCX to ConnHdlr: """ MGCP_Emulation.ttcn:257 Dynamic test case error: Sending data on the connection of port MGCP_CLIENT to 2023:MGCP failed. (Broken pipe) """ Change-Id: I322b070c369500979e3cc13814de1e4bf067726f --- M bsc/BSC_Tests.ttcn 1 file changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/38726/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 4d60ea8..83389a6 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -6456,15 +6456,17 @@ /* When we let MGCP MDCX run into a timeout, it's still in the * queue and additionally after BSSAP HandoverFailure, two DLCX * get sent (for AoIP, for SCCPlite one DLCX). */ - if (g_pars.ignore_mgw_mdcx) { - if (g_pars.aoip) { + if (g_pars.aoip) { + if (g_pars.ignore_mgw_mdcx) { MGCP.receive(tr_MDCX); - MGCP.receive(tr_DLCX); - MGCP.receive(tr_DLCX); - } else { - MGCP_MULTI.receive(tr_MGCP_RecvFrom_any({command := tr_MDCX})); - MGCP_MULTI.receive(tr_MGCP_RecvFrom_any({command := tr_DLCX})); } + MGCP.receive(tr_DLCX); + MGCP.receive(tr_DLCX); + } else { + if (g_pars.ignore_mgw_mdcx) { + MGCP_MULTI.receive(tr_MGCP_RecvFrom_any({command := tr_MDCX})); + } + MGCP_MULTI.receive(tr_MGCP_RecvFrom_any({command := tr_DLCX})); } return; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38726?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: I322b070c369500979e3cc13814de1e4bf067726f Gerrit-Change-Number: 38726 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[L] Change in libosmo-sigtran[master]: sigtran: Make osmo_ss7_user APIs private

by pespin

Attention is currently required from: laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38640?usp=email ) Change subject: sigtran: Make osmo_ss7_user APIs private ...................................................................... Patch Set 6: (1 comment) Patchset: PS2: > It's an open question. […] IMHO is more about let's remove technical debt on something nobody is so far using and which should have been kept private until there was a real need for it. If that seems to be problematic to somebody, I can add now some public APIs like _alloc(), _free(), _set_priv(), _get_priv() for the osmo_ss7_user struct to keep funcionality public, though I think those should be made public whenever somebody needs it (eg. when implementing ISUP). -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38640?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I59d8f70aa81ba396159af40ffd7e8cc6c27cb864 Gerrit-Change-Number: 38640 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 10 Nov 2024 22:32:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: old-tags-against-master: ignore last osmo-bsc tags

by pespin

Attention is currently required from: laforge, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/38698?usp=email ) Change subject: old-tags-against-master: ignore last osmo-bsc tags ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > We should not have "unavoidable" API breaks in libosmo-sigtran. Something is wrong here. […] It's simple: I already fixed all users of libosmo-sigtran to avoid using structs. Hence, structs can finally (it should have been like that since the start) be made private. This means I can now modify structs inside the library, which will be needed to implement AS loadsharing. This also means anyone, in the future, can add new features without breaking ABI/API again. So, imho, here we can accept that broken user code accessing structs is not going to build with newer versions of the library without applying a small patchset (already available in master and/or gerrit), or keep breaking ABI again and again because we don't want to fix the root problem, also in the process making my time 10x times more difficult to implement the features. I'm the first one willing to keep ABI stable, but if we want to do that then we need to reasonable and stop making tons of stuff public-first before there's even a known user of those APIs/structs. Otherwise all this is nonsense imho. BTW, this is still happening with newer libraries like libosmo-pfcp, despite I think I'm raising the topic at review time here and there. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38698?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iac7e6ea7815dd2c3eb9c2636c0caa661161654ed Gerrit-Change-Number: 38698 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 10 Nov 2024 22:24:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

7 months, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: sigtran: Add API osmo_ss7_as_get_asp_protocol()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38717?usp=email ) Change subject: sigtran: Add API osmo_ss7_as_get_asp_protocol() ...................................................................... sigtran: Add API osmo_ss7_as_get_asp_protocol() This is currently needed for osmo-bsc, otherwise it's accessing the struct field of osmo_ss7-as directly. Change-Id: I6171287c9bc76db6561f8ff92c4aebe453efaa7d --- M TODO-RELEASE M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7_as.c 3 files changed, 10 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/TODO-RELEASE b/TODO-RELEASE index f56b4e5..261567c 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -13,3 +13,4 @@ libosmo-sigtran Make private osmo_ss7_route libosmo-sigtran add API osmo_ss7_instance_get_id(), osmo_ss7_instance_get_name(), osmo_ss7_instance_get_pc_fmt(), osmo_ss7_instance_get_primary_pc(), osmo_ss7_get_sccp() libosmo-sigtran add API osmo_ss7_instances_llist_entry() +libosmo-sigtran add API osmo_ss7_as_get_asp_protocol() diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index d4fb87b..83956d8 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -268,6 +268,7 @@ struct osmo_ss7_as * osmo_ss7_as_find_or_create(struct osmo_ss7_instance *inst, const char *name, enum osmo_ss7_asp_protocol proto); +enum osmo_ss7_asp_protocol osmo_ss7_as_get_asp_protocol(const struct osmo_ss7_as *as); int osmo_ss7_as_add_asp(struct osmo_ss7_as *as, const char *asp_name); int osmo_ss7_as_del_asp(struct osmo_ss7_as *as, const char *asp_name); void osmo_ss7_as_destroy(struct osmo_ss7_as *as); diff --git a/src/osmo_ss7_as.c b/src/osmo_ss7_as.c index cc61b12..5af7098 100644 --- a/src/osmo_ss7_as.c +++ b/src/osmo_ss7_as.c @@ -95,6 +95,14 @@ return as; } +/*! \brief Get asp_protocol configuration of a given AS + * \param[in] as Application Server in which to look for \ref asp_protocol + * \returns The asp_protocol this AS is configured with */ +enum osmo_ss7_asp_protocol osmo_ss7_as_get_asp_protocol(const struct osmo_ss7_as *as) +{ + return as->cfg.proto; +} + /*! \brief Add given ASP to given AS * \param[in] as Application Server to which \ref asp is added * \param[in] asp Application Server Process to be added to \ref as -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38717?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I6171287c9bc76db6561f8ff92c4aebe453efaa7d Gerrit-Change-Number: 38717 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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>

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-bsc[master]: bsc_sccplite_msc_send(): Fix msgb leak

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38716?usp=email ) Change subject: bsc_sccplite_msc_send(): Fix msgb leak ...................................................................... bsc_sccplite_msc_send(): Fix msgb leak Change-Id: I08839ae297fa4ec2ffc9ecceb1bad345bf76da10 --- M src/osmo-bsc/bsc_ctrl.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc/bsc_ctrl.c b/src/osmo-bsc/bsc_ctrl.c index 5cc8d90..28f9188 100644 --- a/src/osmo-bsc/bsc_ctrl.c +++ b/src/osmo-bsc/bsc_ctrl.c @@ -671,8 +671,10 @@ } /* don't attempt to send CTRL on a non-SCCPlite AS */ - if (as->cfg.proto != OSMO_SS7_ASP_PROT_IPA) + if (as->cfg.proto != OSMO_SS7_ASP_PROT_IPA) { + msgb_free(msg); return 0; + } return _ss7_as_send(as, msg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38716?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I08839ae297fa4ec2ffc9ecceb1bad345bf76da10 Gerrit-Change-Number: 38716 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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>

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: bts: TC_data_rtp_tchh*: fix timeslot number in comments

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38695?usp=email ) Change subject: bts: TC_data_rtp_tchh*: fix timeslot number in comments ...................................................................... bts: TC_data_rtp_tchh*: fix timeslot number in comments Change-Id: I771e616d52315a26679acb1be17cd4f36eaa52b2 --- M bts/BTS_Tests.ttcn 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index a98b7f3..5e55407 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -8755,13 +8755,13 @@ f_init(); - /* TS1, TCH/H4.8 (6k radio interface rate), transparent service */ + /* TS5, TCH/H4.8 (6k radio interface rate), transparent service */ pars := valueof(t_Pars(ts_RslChanNr_Lm(5, 0), ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_H, RSL_CMOD_CSD_T_4k8))); vc_conn := f_start_handler(refers(f_TC_data_rtp_loopback), pars); vc_conn.done; - /* TS1, TCH/H4.8 (6k radio interface rate), non-transparent service */ + /* TS5, TCH/H4.8 (6k radio interface rate), non-transparent service */ pars := valueof(t_Pars(ts_RslChanNr_Lm(5, 0), ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_H, RSL_CMOD_CSD_NT_6k0))); vc_conn := f_start_handler(refers(f_TC_data_rtp_loopback), pars); @@ -8796,7 +8796,7 @@ f_init(); - /* TS1, TCH/H2.4 (3k6 radio interface rate), transparent services only */ + /* TS5, TCH/H2.4 (3k6 radio interface rate), transparent services only */ pars := valueof(t_Pars(ts_RslChanNr_Lm(5, 0), ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_H, RSL_CMOD_CSD_T_2k4))); vc_conn := f_start_handler(refers(f_TC_data_rtp_loopback), pars); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38695?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: I771e616d52315a26679acb1be17cd4f36eaa52b2 Gerrit-Change-Number: 38695 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(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>

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: bts: add TC_data_facch_*: test FACCH/[FH] on data channels

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38696?usp=email ) Change subject: bts: add TC_data_facch_*: test FACCH/[FH] on data channels ...................................................................... bts: add TC_data_facch_*: test FACCH/[FH] on data channels So far we have been testing the actual traffic on TCH/[FH] in data mode (CSD), but not FACCH/[FH]. Add separate testcases for that. Half-rate variants of the new testcases crash osmo-bts-trx, so comment them out in the control section until the problem is fixed. Change-Id: I2098ccd651fc2a81f62e70be64af386ab0ca6148 Related: OS#6618 --- M bts/BTS_Tests.ttcn M bts/expected-results.xml 2 files changed, 133 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 5e55407..1ba8d53 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -8614,7 +8614,7 @@ var L1ctlMessage l1_dl; timer Td; - log("Testing channel mode ", g_pars.chan_mode); + log(__SCOPE__, "(): Testing channel mode ", g_pars.chan_mode); select (g_pars.chan_mode) { case (tr_RSL_ChanMode_DATA(RSL_CHRT_TCH_F, (RSL_CMOD_CSD_T_14k4, RSL_CMOD_CSD_NT_14k5))) @@ -8679,13 +8679,41 @@ } } - /* TODO: send and expect FACCH */ + f_rtpem_mode(RTPEM_CTRL, RTPEM_MODE_NONE); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rsl_chan_deact(); + f_rslem_unregister(0, g_chan_nr); +} + +private function f_TC_data_facch(charstring id) runs on ConnHdlr { + var RslLinkId link_id := valueof(ts_RslLinkID_DCCH(0)); + var L1ctlMessage l1_dl; + timer Td; + + log(__SCOPE__, "(): Testing channel mode ", g_pars.chan_mode); + + /* Activate the RTP emulation (performs CRCX/MDCX) */ + f_rtpem_activate(mode := RTPEM_MODE_LOOPBACK, rtp_pt := 120); + + /* Tune to the dedicated channel */ + f_l1_tune(L1CTL); + f_est_dchan(act_type := c_RSL_IE_ActType_ASS); + + /* Give it some time to stabilize */ + f_sleep(0.5); + + /* Establish the main SAPI=0 link on FACCH */ + f_est_rll_mo(0, link_id, ''O); + + f_unitdata_mo(link_id, f_rnd_octstring(15)); + f_unitdata_mt(link_id, f_rnd_octstring(15)); f_rtpem_mode(RTPEM_CTRL, RTPEM_MODE_NONE); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); f_rsl_chan_deact(); f_rslem_unregister(0, g_chan_nr); } + testcase TC_data_rtp_tchf144() runs on test_CT { var ConnHdlr vc_conn; var ConnHdlrPars pars; @@ -8706,6 +8734,20 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } +testcase TC_data_facch_tchf144() runs on test_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars; + + f_init(); + + /* TS1, TCH/F14.4 (14k5 radio interface rate), transparent service */ + pars := valueof(t_Pars(ts_RslChanNr_Bm(1), + ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_F, RSL_CMOD_CSD_T_14k4))); + vc_conn := f_start_handler(refers(f_TC_data_facch), pars); + vc_conn.done; + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} testcase TC_data_rtp_tchf96() runs on test_CT { var ConnHdlr vc_conn; @@ -8727,6 +8769,20 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } +testcase TC_data_facch_tchf96() runs on test_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars; + + f_init(); + + /* TS1, TCH/F9.6 (12k radio interface rate), transparent service */ + pars := valueof(t_Pars(ts_RslChanNr_Bm(1), + ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_F, RSL_CMOD_CSD_T_9k6))); + vc_conn := f_start_handler(refers(f_TC_data_facch), pars); + vc_conn.done; + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} testcase TC_data_rtp_tchf48() runs on test_CT { var ConnHdlr vc_conn; @@ -8748,6 +8804,20 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } +testcase TC_data_facch_tchf48() runs on test_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars; + + f_init(); + + /* TS1, TCH/F4.8 (6k radio interface rate), transparent service */ + pars := valueof(t_Pars(ts_RslChanNr_Bm(1), + ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_F, RSL_CMOD_CSD_T_4k8))); + vc_conn := f_start_handler(refers(f_TC_data_facch), pars); + vc_conn.done; + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} testcase TC_data_rtp_tchh48() runs on test_CT { var ConnHdlr vc_conn; @@ -8769,6 +8839,20 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } +testcase TC_data_facch_tchh48() runs on test_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars; + + f_init(); + + /* TS5, TCH/H4.8 (6k radio interface rate), transparent service */ + pars := valueof(t_Pars(ts_RslChanNr_Lm(5, 0), + ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_H, RSL_CMOD_CSD_T_4k8))); + vc_conn := f_start_handler(refers(f_TC_data_facch), pars); + vc_conn.done; + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} testcase TC_data_rtp_tchf24() runs on test_CT { var ConnHdlr vc_conn; @@ -8789,6 +8873,20 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } +testcase TC_data_facch_tchf24() runs on test_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars; + + f_init(); + + /* TS1, TCH/F2.4 (3k6 radio interface rate), transparent services only */ + pars := valueof(t_Pars(ts_RslChanNr_Bm(1), + ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_F, RSL_CMOD_CSD_T_2k4))); + vc_conn := f_start_handler(refers(f_TC_data_facch), pars); + vc_conn.done; + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} testcase TC_data_rtp_tchh24() runs on test_CT { var ConnHdlr vc_conn; @@ -8809,6 +8907,20 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } +testcase TC_data_facch_tchh24() runs on test_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars; + + f_init(); + + /* TS5, TCH/H2.4 (3k6 radio interface rate), transparent services only */ + pars := valueof(t_Pars(ts_RslChanNr_Lm(5, 0), + ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_H, RSL_CMOD_CSD_T_2k4))); + vc_conn := f_start_handler(refers(f_TC_data_facch), pars); + vc_conn.done; + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} private function f_TC_early_immediate_assignment(charstring id) runs on ConnHdlr { @@ -9437,6 +9549,13 @@ execute( TC_data_rtp_tchf24() ); execute( TC_data_rtp_tchh24() ); + execute( TC_data_facch_tchf144() ); + execute( TC_data_facch_tchf96() ); + execute( TC_data_facch_tchf48() ); + execute( TC_data_facch_tchh48() ); + execute( TC_data_facch_tchf24() ); + execute( TC_data_facch_tchh24() ); + execute( TC_early_immediate_assignment() ); execute( TC_acch_overpower_rxqual_thresh() ); diff --git a/bts/expected-results.xml b/bts/expected-results.xml index c06f328..c10e668 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='Titan' tests='242' failures='5' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='Titan' tests='248' failures='5' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='BTS_Tests' name='TC_est_dchan' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_chan_act_stress' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_chan_act_react' time='MASKED'/> @@ -194,6 +194,17 @@ <testcase classname='BTS_Tests' name='TC_data_rtp_tchh48' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_data_rtp_tchf24' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_data_rtp_tchh24' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_data_facch_tchf144' time='MASKED'> + <failure type='fail-verdict'>Rx unexpected RSL port message: MASKED + BTS_Tests.ttcn:MASKED BTS_Tests control part + BTS_Tests.ttcn:MASKED TC_data_rtp_tchf144 testcase + </failure> + </testcase> + <testcase classname='BTS_Tests' name='TC_data_facch_tchf96' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_data_facch_tchf48' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_data_facch_tchh48' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_data_facch_tchf24' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_data_facch_tchh24' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_early_immediate_assignment' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_acch_overpower_rxqual_thresh' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_acch_overpower_rxqual_thresh_dtx' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38696?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: I2098ccd651fc2a81f62e70be64af386ab0ca6148 Gerrit-Change-Number: 38696 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(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>

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: bts: use proper ActType in f_TC_data_rtp_loopback()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38694?usp=email ) Change subject: bts: use proper ActType in f_TC_data_rtp_loopback() ...................................................................... bts: use proper ActType in f_TC_data_rtp_loopback() For the sake of correctness, use c_RSL_IE_ActType_ASS (assignment) when activating TCH/[FH] channels in TC_data_rtp_*. This is the kind of ActType that would normally be used by the BSC. Change-Id: Ide773c3fcfdab881756d5fe5b6c314b0c0335043 --- M bts/BTS_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 64804f5..a98b7f3 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -8647,7 +8647,7 @@ /* Tune to the dedicated channel */ f_l1_tune(L1CTL); - f_est_dchan(); + f_est_dchan(act_type := c_RSL_IE_ActType_ASS); /* Send a pseudo-random data frame on the Uplink */ log("Sending Uplink TCH (len=", lengthof(udata), "): ", udata); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38694?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: Ide773c3fcfdab881756d5fe5b6c314b0c0335043 Gerrit-Change-Number: 38694 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(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>

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: bts: add TC_data_facch_*: test FACCH/[FH] on data channels

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38696?usp=email ) Change subject: bts: add TC_data_facch_*: test FACCH/[FH] on data channels ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38696?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: I2098ccd651fc2a81f62e70be64af386ab0ca6148 Gerrit-Change-Number: 38696 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(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> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Sun, 10 Nov 2024 13:20:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024