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

[XS] Change in osmo-hnbgw[pespin/rel-1.5.0]: context_map_sccp: Fix assert hit due to missing ev handling

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38709?usp=email ) Change subject: context_map_sccp: Fix assert hit due to missing ev handling ...................................................................... context_map_sccp: Fix assert hit due to missing ev handling This was being triggered recently by HNBGW_Tests.TC_ranap_cs_mo_disconnect in osmo-ttcn3-hacks.git. Change-Id: Idaad11eaa3c2e56de792f80bab1f1d8435ef9b68 (cherry picked from commit 0e987d7f3c714bea237beb8c72d70103cbf65031) --- M src/osmo-hnbgw/context_map_sccp.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved; Verified laforge: Looks good to me, but someone else must approve diff --git a/src/osmo-hnbgw/context_map_sccp.c b/src/osmo-hnbgw/context_map_sccp.c index 9b4837d..4a78337 100644 --- a/src/osmo-hnbgw/context_map_sccp.c +++ b/src/osmo-hnbgw/context_map_sccp.c @@ -452,6 +452,7 @@ handle_rx_sccp(fi, ranap_msg); return; + case MAP_SCCP_EV_RAN_LINK_LOST: case MAP_SCCP_EV_USER_ABORT: case MAP_SCCP_EV_CN_LINK_LOST: /* Stop waiting for RLSD, send RLSD now. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38709?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: pespin/rel-1.5.0 Gerrit-Change-Id: Idaad11eaa3c2e56de792f80bab1f1d8435ef9b68 Gerrit-Change-Number: 38709 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-hnbgw[pespin/rel-1.5.0]: hnbgw_cn: Remove assert hit due to wrong assumption

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38708?usp=email ) Change subject: hnbgw_cn: Remove assert hit due to wrong assumption ...................................................................... hnbgw_cn: Remove assert hit due to wrong assumption The HNBGW in correctly assumes that no ss7->sccp instance is allocated until the same function calls osmo_sccp_simple_client_on_ss7_id(). This assumption is wrong, since ss7 may create its own ss7->sccp instance internally as a result of vty configuration, eg. when "sccp max-optional-data 124" is placed in osmo-hnbgw.cfg file. In this scenario, simply removing the assert is enough, since osmo_sccp_simple_client_on_ss7_id() just calls osmo_ss7_ensure_sccp(), the same that the libmoso-sccp code called to allocate the pointer. Related: SYS#6566 Fixes: f3caea850bc892551cd09bbaf49f798c172590c4 Change-Id: I1221c165156e9625324cf0080836a8ed2bad4e9c (cherry picked from commit 8514b73bff61c26d40552a82278317565d6cf110) --- M src/osmo-hnbgw/hnbgw_cn.c 1 file changed, 1 insertion(+), 5 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved; Verified diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index b95cf28..31bf192 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -849,11 +849,7 @@ return 0; } /* else cnlink->hnbgw_sccp_user stays NULL and is set up below. */ - LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "cs7 instance %u has no SCCP instance yet\n", ss7->cfg.id); - - /* All SCCP instances should originate from this function. So if there is no hnbgw_sccp_user for the cs7 - * instance, then the cs7 instance should not have an SCCP instance yet. */ - OSMO_ASSERT(!ss7->sccp); + LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "cs7 instance %u has no configured SCCP instance yet\n", ss7->cfg.id); } /* No SCCP instance yet for this ss7. Create it. If no address name is given that resolves to a -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38708?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: pespin/rel-1.5.0 Gerrit-Change-Id: I1221c165156e9625324cf0080836a8ed2bad4e9c Gerrit-Change-Number: 38708 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-hnbgw[pespin/rel-1.5.0]: drop config.vty tests from make check

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38710?usp=email ) Change subject: drop config.vty tests from make check ...................................................................... drop config.vty tests from make check The intention of those tests was to test various osmo-hnbgw startup scenarios. It seemed the fastest/simplest way to do it at the time, but the output depends on another library, regularly causing test fallout. Keep the tests around for reference. They can still be invoked manually with 'make config-tests'. Related: OS#6380 Change-Id: I9c1540904b13d25db1c7933a88f6cc4b028fdd2b (cherry picked from commit 4468d8728e07d9e74a8b08d8bf2d903cc4c5bbfc) --- M tests/Makefile.am 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved; Verified laforge: Looks good to me, but someone else must approve diff --git a/tests/Makefile.am b/tests/Makefile.am index d499c33..f890614 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -41,7 +41,6 @@ if ENABLE_EXT_TESTS python-tests: $(MAKE) vty-test - $(MAKE) config-tests osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v else @@ -63,6 +62,11 @@ $(U) $(srcdir)/$(VTY_TEST) # Test each config/*.cfg file with the corresponding config/*.vty transcript test. +# +# To be invoked manually only: This is not part of 'make check' because the +# output may change when libosmo-sccp changes its VTY appearance, which can +# cause annoying test fallout. +# # Each config test runs an osmo-hnbgw process to talk to, so they must not run concurrently. # To prevent 'make -j N' from running these tests in parallel, call a script with a linear for-loop. .PHONY: config-tests -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38710?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: pespin/rel-1.5.0 Gerrit-Change-Id: I9c1540904b13d25db1c7933a88f6cc4b028fdd2b Gerrit-Change-Number: 38710 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-hnbgw[pespin/rel-1.5.0]: ps_rab_ass_fsm: Fix uninitialized ptr access

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38711?usp=email ) Change subject: ps_rab_ass_fsm: Fix uninitialized ptr access ...................................................................... ps_rab_ass_fsm: Fix uninitialized ptr access /git/osmo-hnbgw/include/osmocom/hnbgw/context_map.h:211:9: error: 'rab' may be used uninitialized [-Werror=maybe-uninitialized] 211 | _map_rua_dispatch(MAP, EVENT, MSGB, __FILE__, __LINE__) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /git/osmo-hnbgw/src/osmo-hnbgw/ps_rab_ass_fsm.c:358:9: note: in expansion of macro 'map_rua_dispatch' 358 | map_rua_dispatch(rab->map, MAP_RUA_EV_TX_DIRECT_TRANSFER, msg); | ^~~~~~~~~~~~~~~~ /git/osmo-hnbgw/src/osmo-hnbgw/ps_rab_ass_fsm.c:297:24: note: 'rab' was declared here 297 | struct ps_rab *rab; | ^~~ Change-Id: Ifdcd4c369b35820c5c2beb695392d0b82d4ea34c (cherry picked from commit 89504050ea481a517d7da68b008c19e83f37aae2) --- M src/osmo-hnbgw/ps_rab_ass_fsm.c 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved; Verified diff --git a/src/osmo-hnbgw/ps_rab_ass_fsm.c b/src/osmo-hnbgw/ps_rab_ass_fsm.c index 4dff7c6..b826c89 100644 --- a/src/osmo-hnbgw/ps_rab_ass_fsm.c +++ b/src/osmo-hnbgw/ps_rab_ass_fsm.c @@ -294,7 +294,7 @@ /* See whether all information is in so that we can forward the modified RAB Assignment Request to RUA. */ static void ps_rab_ass_req_check_local_f_teids(struct ps_rab_ass *rab_ass) { - struct ps_rab *rab; + struct ps_rab *rab = NULL; RANAP_RAB_AssignmentRequestIEs_t *ies = &rab_ass->ranap_rab_ass_req_message->msg.raB_AssignmentRequestIEs; int i; struct msgb *msg; @@ -346,6 +346,12 @@ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifyItemFirst, &first); } + if (!rab) { + LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "Lookup PS RAB Assignment Request failed\n"); + ps_rab_ass_failure(rab_ass); + return; + } + /* Send the modified RAB Assignment Request to the hNodeB, wait for the RAB Assignment Response */ msg = ranap_rab_ass_req_encode(ies); if (!msg) { -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38711?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: pespin/rel-1.5.0 Gerrit-Change-Id: Ifdcd4c369b35820c5c2beb695392d0b82d4ea34c Gerrit-Change-Number: 38711 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-hnbgw[pespin/rel-1.5.0]: hnbgw: Fix wrong map object retrieved from hashtable

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38712?usp=email ) Change subject: hnbgw: Fix wrong map object retrieved from hashtable ...................................................................... hnbgw: Fix wrong map object retrieved from hashtable If several map objects (mapping between RUA and SCCP transports for a given Iu connection) ended up in the same hashtable bucket, then the first one was always returned by map_from_conn_id(). As a result, when such collisions happened (e.g. when a big number of connections were inserted) a user could see a Iu message coming from SCCP connection "A" end up being forwarded to an unrelated RUA connection "B". Related: SYS#6602 Fixes: f3caea850bc892551cd09bbaf49f798c172590c4 Change-Id: I107f461bf5bcb92262422c893b23d190659f6f72 (cherry picked from commit e6d87ff967fe614e917d8d9434bc5bd5a6f3d3d6) --- M src/osmo-hnbgw/hnbgw_cn.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved; Verified diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 31bf192..f44f852 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -431,8 +431,10 @@ const struct osmo_prim_hdr *oph) { struct hnbgw_context_map *map; - hash_for_each_possible(hsu->hnbgw_context_map_by_conn_id, map, hnbgw_sccp_user_entry, conn_id) - return map; + hash_for_each_possible(hsu->hnbgw_context_map_by_conn_id, map, hnbgw_sccp_user_entry, conn_id) { + if (map->scu_conn_id == conn_id) + return map; + } LOGP(DRANAP, LOGL_ERROR, "Rx for unknown SCCP connection ID: %u: %s\n", conn_id, osmo_scu_prim_hdr_name_c(OTC_SELECT, oph)); return NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38712?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: pespin/rel-1.5.0 Gerrit-Change-Id: I107f461bf5bcb92262422c893b23d190659f6f72 Gerrit-Change-Number: 38712 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[pespin/rel-1.5.0]: Bump version: 1.5.0.5-b431 → 1.5.1

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38713?usp=email ) Change subject: Bump version: 1.5.0.5-b431 → 1.5.1 ...................................................................... Bump version: 1.5.0.5-b431 → 1.5.1 Change-Id: I1cccf6c3851b05787dcd82026065d74af08ddc84 --- M TODO-RELEASE M debian/changelog 2 files changed, 17 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, approved; Verified laforge: Looks good to me, but someone else must approve diff --git a/TODO-RELEASE b/TODO-RELEASE index d0852fc..0ed7189 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,9 +1,9 @@ # When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install -# according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info… -# In short: +# according to https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release +# In short: https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info… # LIBVERSION=c:r:a # If the library source code has changed at all since the last update, then increment revision: c:r + 1:a. -# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0. +# If any interfaces have been added, removed, or changed since the last update: c + 1:0:a. # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. -#library what description / commit summary line +#library what description / commit summary line diff --git a/debian/changelog b/debian/changelog index cd1fe30..dcd2577 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +osmo-hnbgw (1.5.1) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * hnbgw_cn: Remove assert hit due to wrong assumption + * context_map_sccp: Fix assert hit due to missing ev handling + * ps_rab_ass_fsm: Fix uninitialized ptr access + * hnbgw: Fix wrong map object retrieved from hashtable + + [ Neels Janosch Hofmeyr ] + * drop config.vty tests from make check + + -- Pau Espin Pedrol <pespin(a)sysmocom.de> Fri, 08 Nov 2024 16:05:31 +0100 + osmo-hnbgw (1.5.0) unstable; urgency=medium [ Neels Janosch Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38713?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: pespin/rel-1.5.0 Gerrit-Change-Id: I1cccf6c3851b05787dcd82026065d74af08ddc84 Gerrit-Change-Number: 38713 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[pespin/rel-1.5.0]: Bump version: 1.5.0.5-b431 → 1.5.1

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38713?usp=email ) Change subject: Bump version: 1.5.0.5-b431 → 1.5.1 ...................................................................... Patch Set 1: Code-Review+2 Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38713?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: pespin/rel-1.5.0 Gerrit-Change-Id: I1cccf6c3851b05787dcd82026065d74af08ddc84 Gerrit-Change-Number: 38713 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Nov 2024 10:20:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-hnbgw[pespin/rel-1.5.0]: hnbgw: Fix wrong map object retrieved from hashtable

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38712?usp=email ) Change subject: hnbgw: Fix wrong map object retrieved from hashtable ...................................................................... Patch Set 1: Code-Review+2 Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38712?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: pespin/rel-1.5.0 Gerrit-Change-Id: I107f461bf5bcb92262422c893b23d190659f6f72 Gerrit-Change-Number: 38712 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Nov 2024 10:20:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-hnbgw[pespin/rel-1.5.0]: ps_rab_ass_fsm: Fix uninitialized ptr access

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38711?usp=email ) Change subject: ps_rab_ass_fsm: Fix uninitialized ptr access ...................................................................... Patch Set 1: Code-Review+2 Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38711?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: pespin/rel-1.5.0 Gerrit-Change-Id: Ifdcd4c369b35820c5c2beb695392d0b82d4ea34c Gerrit-Change-Number: 38711 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Nov 2024 10:20:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-hnbgw[pespin/rel-1.5.0]: drop config.vty tests from make check

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38710?usp=email ) Change subject: drop config.vty tests from make check ...................................................................... Patch Set 1: Code-Review+2 Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38710?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: pespin/rel-1.5.0 Gerrit-Change-Id: I9c1540904b13d25db1c7933a88f6cc4b028fdd2b Gerrit-Change-Number: 38710 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Nov 2024 10:20:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024