pespin has uploaded this change for review. ( 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(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/08/38708/1
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: newchange
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>
pespin has uploaded this change for review. ( 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(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/09/38709/1
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: newchange
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>
Attention is currently required from: fixeria, osmith.
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38700?usp=email )
Change subject: drop config.vty tests from make check
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
Build failures are expected since this is building against master libosmo-sigtran, while this is supposed to be building against libosmo-sigtran from latest.
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38700?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.6.0
Gerrit-Change-Id: I9c1540904b13d25db1c7933a88f6cc4b028fdd2b
Gerrit-Change-Number: 38700
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-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 08 Nov 2024 14:57:27 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38700?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
---
M tests/Makefile.am
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/00/38700/1
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a4dcf4c..257c0bf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -43,7 +43,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
@@ -69,6 +68,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/+/38700?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: pespin/rel-1.6.0
Gerrit-Change-Id: I9c1540904b13d25db1c7933a88f6cc4b028fdd2b
Gerrit-Change-Number: 38700
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>