July 2025 - gerrit-log - lists.osmocom.org

[S] Change in libosmo-sigtran[master]: ss7_vty: Avoid adding rote to local PC in role ASP

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40579?usp=email ) Change subject: ss7_vty: Avoid adding rote to local PC in role ASP ...................................................................... ss7_vty: Avoid adding rote to local PC in role ASP This commit basically reverts b4f1b2cb8bd404f08601dc8ca700b672a455846c from ~4 years ago. In ASP role, the routing-key is configured with a local PC, since that's what's announced during RKM towards the SG. Hence, it makes no sense adding a route pointing to a local PCm because the M3UA routing decisions first check if the DPC is local, and only then otherwise tries to route it. Change-Id: Ic602de42e37c4579f530823bb41e0a8193ce73bb --- M src/ss7_as_vty.c M src/ss7_vty.c M src/ss7_vty.h 3 files changed, 1 insertion(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/79/40579/1 diff --git a/src/ss7_as_vty.c b/src/ss7_as_vty.c index 6ea170e..0b0ddc1 100644 --- a/src/ss7_as_vty.c +++ b/src/ss7_as_vty.c @@ -288,7 +288,6 @@ { struct osmo_ss7_as *as = vty->index; struct osmo_ss7_routing_key *rkey = &as->cfg.routing_key; - struct osmo_ss7_route *rt; int pc; if (as->cfg.proto == OSMO_SS7_ASP_PROT_IPA && atoi(rcontext) != 0) { @@ -303,34 +302,12 @@ return CMD_WARNING; } - /* When libosmo-sigtran is used in ASP role, the VTY routing table node - * (config-cs7-rt) is not available. However, when we add a routing key - * to an AS we still have to put a matching dynamic route into the routing - * table. This is done automatically by first removing the old dynamic route - * (users may change the routing key via VTY during runtime) and then - * putting a new dynamic route (see below). */ - if (cs7_role == CS7_ROLE_ASP) { - rt = ss7_route_table_find_route_by_dpc_mask(as->inst->rtable_system, - rkey->pc, 0xffffff, - true); - if (rt) - ss7_route_destroy(rt); - } - rkey->pc = pc; rkey->context = atoi(rcontext); /* FIXME: input validation */ rkey->si = si ? get_string_value(mtp_si_vals, si) : 0; /* FIXME: input validation */ rkey->ssn = ssn ? atoi(ssn) : 0; /* FIXME: input validation */ - /* automatically add new dynamic route (see also comment above) */ - if (cs7_role == CS7_ROLE_ASP) { - if (!ss7_route_create(as->inst->rtable_system, rkey->pc, 0xffffff, true, as->cfg.name)) { - vty_out(vty, "Cannot create route (pc=%s, linkset=%s) to AS %s", dpc, as->cfg.name, VTY_NEWLINE); - return CMD_WARNING; - } - } - return CMD_SUCCESS; } diff --git a/src/ss7_vty.c b/src/ss7_vty.c index 9916185..a8869d4 100644 --- a/src/ss7_vty.c +++ b/src/ss7_vty.c @@ -75,7 +75,7 @@ * Core CS7 Configuration ***********************************************************************/ -enum cs7_role_t cs7_role; +static enum cs7_role_t cs7_role; void *g_ctx; static struct cmd_node cs7_node = { diff --git a/src/ss7_vty.h b/src/ss7_vty.h index 18dc5a6..3bafffd 100644 --- a/src/ss7_vty.h +++ b/src/ss7_vty.h @@ -18,7 +18,6 @@ }; extern void *g_ctx; -extern enum cs7_role_t cs7_role; extern const struct value_string ipproto_vals[]; #define CS7_STR "ITU-T Signaling System 7\n" -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40579?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: Ic602de42e37c4579f530823bb41e0a8193ce73bb Gerrit-Change-Number: 40579 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

4 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: cosmetic: Fix typo in comment

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40578?usp=email ) Change subject: cosmetic: Fix typo in comment ...................................................................... cosmetic: Fix typo in comment Change-Id: Ide34bf01230fd416c8192a90474039e2f41cb6cd --- M src/ss7_vty.c M src/xua_snm.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/78/40578/1 diff --git a/src/ss7_vty.c b/src/ss7_vty.c index a3f1a34..9916185 100644 --- a/src/ss7_vty.c +++ b/src/ss7_vty.c @@ -1334,7 +1334,7 @@ llist_for_each_entry(as, &inst->as_list, list) ss7_vty_write_one_as(vty, as, show_dyn_config); - /* now dump everything that is relevent for the SG role */ + /* now dump everything that is relevant for the SG role */ if (cs7_role == CS7_ROLE_SG) { /* dump routes, as their target ASs exist */ diff --git a/src/xua_snm.c b/src/xua_snm.c index 6bbeec7..04568d2 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -167,7 +167,7 @@ rt = ss7_route_table_find_route_by_dpc_mask_as(s7i->rtable_system, pc, 0xffffff, as, true); if (!rt) { /* No dynamic fully qualified route found. Add dynamic fully - * squalified route and mark it as (un)available: */ + * qualified route and mark it as (un)available: */ rt = ss7_route_create(s7i->rtable_system, pc, 0xffffff, true, as->cfg.name); if (!rt) { LOGPAS(as, DLSS7, LOGL_ERROR, "Unable to create dynamic route for pc=%u=%s status=%s\n", -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40578?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: Ide34bf01230fd416c8192a90474039e2f41cb6cd Gerrit-Change-Number: 40578 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

4 weeks

1
0
0 0

[M] Change in pysim[master]: smdpp: less verbose by default

by Hoernchen

Attention is currently required from: dexter, laforge, lynxis lazus. Hoernchen has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/pysim/+/40468?usp=email ) Change subject: smdpp: less verbose by default ...................................................................... Patch Set 11: (4 comments) File osmo-smdpp.py: https://gerrit.osmocom.org/c/pysim/+/40468/comment/a6b29ec5_52efdc65?usp=em… : PS6, Line 112: #print("Using nameConstraints parsing for variant O certificate") > Should this debug? Or not could you drop the line? Done https://gerrit.osmocom.org/c/pysim/+/40468/comment/353ab3c0_75e9a30d?usp=em… : PS6, Line 117: #print("Using GSMA permittedEins parsing for newer certificate variant") > Should this debug? Or not could you drop the line? Done https://gerrit.osmocom.org/c/pysim/+/40468/comment/cdcf06dd_b9df7316?usp=em… : PS6, Line 362: #logger.debug("Rx JSON: %s" % json.dumps(content)) > logger. […] Done https://gerrit.osmocom.org/c/pysim/+/40468/comment/662ef91a_bf689b6b?usp=em… : PS6, Line 370: logger.debug("Tx JSON: %s" % json.dumps(output)[:200]) > Is this an expensive operations because the object is huge (json.dumps)? […] Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40468?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I04a72b8f52417862d4dcba1f0743700dd942ef49 Gerrit-Change-Number: 40468 Gerrit-PatchSet: 11 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Jul 2025 15:50:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

4 weeks

1
0
0 0

[XS] Change in pysim[master]: x509 cert: fix weird cert check

by Hoernchen

Attention is currently required from: Hoernchen. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/40524?usp=email to look at the new patch set (#7). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: x509 cert: fix weird cert check ...................................................................... x509 cert: fix weird cert check Change-Id: I18beab0e1b24579724704c4141a2c457b2d4cf99 --- M pySim/esim/x509_cert.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/24/40524/7 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40524?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I18beab0e1b24579724704c4141a2c457b2d4cf99 Gerrit-Change-Number: 40524 Gerrit-PatchSet: 7 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>

4 weeks

1
0
0 0

[M] Change in pysim[master]: smdpp: less verbose by default

by Hoernchen

Attention is currently required from: Hoernchen, dexter, laforge. Hello Jenkins Builder, dexter, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/40468?usp=email to look at the new patch set (#11). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: smdpp: less verbose by default ...................................................................... smdpp: less verbose by default Those data blobs are huge. Change-Id: I04a72b8f52417862d4dcba1f0743700dd942ef49 --- M osmo-smdpp.py M pySim/esim/bsp.py M pySim/esim/es8p.py 3 files changed, 86 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/68/40468/11 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40468?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I04a72b8f52417862d4dcba1f0743700dd942ef49 Gerrit-Change-Number: 40468 Gerrit-PatchSet: 11 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de>

4 weeks

1
0
0 0

[S] Change in pysim[master]: smdpp: verify cert chain

by Hoernchen

Attention is currently required from: Hoernchen, dexter. Hello Jenkins Builder, dexter, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/40469?usp=email to look at the new patch set (#12). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: smdpp: verify cert chain ...................................................................... smdpp: verify cert chain Change-Id: I1e4e4b1b032dc6a8b7d15bd80d533a50fe0cff15 --- M osmo-smdpp.py 1 file changed, 20 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/69/40469/12 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40469?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1e4e4b1b032dc6a8b7d15bd80d533a50fe0cff15 Gerrit-Change-Number: 40469 Gerrit-PatchSet: 12 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de>

4 weeks

1
0
0 0

[S] Change in pysim[master]: smdpp: map test mode matching id to existing profile for convenience

by Hoernchen

Attention is currently required from: Hoernchen. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/40576?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: smdpp: map test mode matching id to existing profile for convenience ...................................................................... smdpp: map test mode matching id to existing profile for convenience Either that, or we have to create actual files we can serve. Change-Id: I6c8c08343678e9a3b978bc9c43a9b56a8d832d10 --- M osmo-smdpp.py 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/76/40576/5 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40576?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6c8c08343678e9a3b978bc9c43a9b56a8d832d10 Gerrit-Change-Number: 40576 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>

4 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: Support expect RFC466 4.5.1 DUNA after ASP ACT

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40569?usp=email ) Change subject: stp: Support expect RFC466 4.5.1 DUNA after ASP ACT ...................................................................... stp: Support expect RFC466 4.5.1 DUNA after ASP ACT libosmo-sigtran recently introduced support in SG role to send DUNA for unreachablew destinations when a peer ASP becomes activated. This is currently sent upon first ASP going active, since it's the time where SG assumes the ASP peer may need that information. Depends: libosmo-sigtran.git Id9d92c3fda7423a9c79fffac6b650abba9651853 Change-Id: I6bee0f890a8baaa62be193824b1ae2fceb53fb45 --- M stp/STP_Tests_IPA_M3UA.ttcn M stp/STP_Tests_M3UA.ttcn 2 files changed, 39 insertions(+), 9 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/stp/STP_Tests_IPA_M3UA.ttcn b/stp/STP_Tests_IPA_M3UA.ttcn index 1def77f..3ad00c7 100644 --- a/stp/STP_Tests_IPA_M3UA.ttcn +++ b/stp/STP_Tests_IPA_M3UA.ttcn @@ -55,7 +55,8 @@ f_init_ipa(); f_connect_ipa(0); - f_M3UA_asp_up_act(0, omit, rctx_sender); + /* exp_duna_after_act = false: There's no other unavailable AS configured at the STP at this point. */ + f_M3UA_asp_up_act(0, omit, rctx_sender, exp_duna_after_act := false); /* send a well-formed, encoded SCCP message via M3UA */ var octetstring sccp_enc := f_SCCP_UDT(); @@ -86,7 +87,8 @@ f_init_ipa(ipa_configs := ipa_configs); f_connect_ipa(0); - f_M3UA_asp_up_act(0, omit, rctx_receiver); + /* exp_duna_after_act = false: There's no other unavailable AS configured at the STP at this point. */ + f_M3UA_asp_up_act(0, omit, rctx_receiver, exp_duna_after_act := false); /* send a well-formed, encoded SCCP message via IPA */ var octetstring sccp_enc := f_SCCP_UDT(); @@ -117,7 +119,8 @@ f_init_ipa(ipa_configs := ipa_configs); f_connect_ipa(0); - f_M3UA_asp_up_act(0, omit, rctx_receiver); + /* exp_duna_after_act = false: There's no other unavailable AS configured at the STP at this point. */ + f_M3UA_asp_up_act(0, omit, rctx_receiver, exp_duna_after_act := false); /* send a well-formed, encoded SCCP message via IPA */ var octetstring sccp_enc := f_SCCP_UDT(); @@ -151,7 +154,8 @@ f_init_ipa(); f_connect_ipa(0); - f_M3UA_asp_up_act(0, omit, rctx_receiver); + /* exp_duna_after_act = false: There's no other unavailable AS configured at the STP at this point. */ + f_M3UA_asp_up_act(0, omit, rctx_receiver, exp_duna_after_act := false); /* send a well-formed, encoded SCCP message via IPA */ var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index a98ffdc..ebdb6e1 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -73,6 +73,7 @@ port M3UA_CODEC_PT M3UA[MAX_NR_M3UA]; var M3uaConfigs g_m3ua_configs; var integer g_m3ua_conn_id[MAX_NR_M3UA]; + var boolean g_iut_supports_rfc666_4_5_1_duna_after_act := true; /* RFC4666 4.5.1 */ } friend function f_m3ua_get_config_idx(charstring asp_name) runs on RAW_M3UA_CT return integer { @@ -336,6 +337,9 @@ f_init_common(); + /* Set always to true once libosmo-sigtran > 2.1.0 is released: */ + g_iut_supports_rfc666_4_5_1_duna_after_act := Misc_Helpers.f_osmo_repo_is("nightly"); + if (not istemplatekind(m3ua_configs, "omit")) { g_m3ua_configs := valueof(m3ua_configs); } else { @@ -459,7 +463,8 @@ friend function f_M3UA_asp_up_act(integer idx, template (omit) M3UA_Traffic_Mode_Type tmt := omit, template (omit) OCT4 rctx := omit, template (omit) OCT2 ntfy_after_up := c_M3UA_ST_I_AS_INACTIVE, - template (omit) OCT2 ntfy_after_act := c_M3UA_ST_I_AS_ACTIVE) + template (omit) OCT2 ntfy_after_act := c_M3UA_ST_I_AS_ACTIVE, + template (omit) boolean exp_duna_after_act := omit /* auto */) runs on RAW_M3UA_CT { f_M3UA_asp_up(idx, omit); if (not istemplatekind(ntfy_after_up, "omit")) { @@ -469,6 +474,20 @@ if (not istemplatekind(ntfy_after_act, "omit")) { f_M3UA_exp(idx, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, ntfy_after_act, *)); } + if (g_iut_supports_rfc666_4_5_1_duna_after_act) { + var boolean exp_duna; + if (istemplatekind(exp_duna_after_act, "omit")) { + /* By default, we expect to receive RFC4666 4.5.1 DUNA + * if AS becomes active, since at that time SG expects us + * to not know current state of other AS destinations. */ + exp_duna := not istemplatekind(ntfy_after_act, "omit") and valueof(ntfy_after_act) == c_M3UA_ST_I_AS_ACTIVE; + } else { + exp_duna := valueof(exp_duna_after_act); + } + if (exp_duna) { + f_M3UA_exp(idx, tr_M3UA_DUNA); + } + } } @@ -1010,8 +1029,9 @@ testcase TC_rkm_unreg_active() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-sender" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT3 dpc := int2oct(123, 3); + var OCT3 dpcA := int2oct(123, 3); var OCT4 rctxA := int2oct(1234, 4); + var OCT3 dpcB := int2oct(m3ua_configs[0].point_code, 4); // must match config var OCT4 rctxB := int2oct(m3ua_configs[0].routing_ctx, 4); // must match config f_init_common(); @@ -1019,7 +1039,7 @@ f_init_m3ua(m3ua_configs := m3ua_configs); /* first register the routing key */ - f_M3UA_rkm_register(0, local_id:='30000099'O, dpc:=dpc, rctx:=rctxA, ntfy_after_reg := omit); + f_M3UA_rkm_register(0, local_id:='30000099'O, dpc:=dpcA, rctx:=rctxA, ntfy_after_reg := omit); /* then activate the ASP, this turns the 2 AS (one for each rctx, 1234 and default 1023) * INACTIVE, handle the 2 NOTIFY manually afterwards: */ @@ -1028,9 +1048,15 @@ f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, (rctxA & rctxB, rctxB & rctxA))); f_M3UA_asp_act(0, omit, rctxB); f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, (rctxA & rctxB, rctxB & rctxA))); - f_M3UA_exp(0, tr_M3UA_DAVA({*}, rctxA)); + f_M3UA_exp(0, tr_M3UA_DAVA({ts_M3UA_PC(oct2int(dpcB))}, rctxA)); + if (g_iut_supports_rfc666_4_5_1_duna_after_act) { + f_M3UA_exp(0, tr_M3UA_DUNA({*}, rctxB)); + } f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, (rctxA & rctxB, rctxB & rctxA))); - f_M3UA_exp(0, tr_M3UA_DAVA({*}, rctxB)); + f_M3UA_exp(0, tr_M3UA_DAVA({ts_M3UA_PC(oct2int(dpcA))}, rctxB)); + if (g_iut_supports_rfc666_4_5_1_duna_after_act) { + f_M3UA_exp(0, tr_M3UA_DUNA({*}, rctxA)); + } /* then try to de-register -> ERR_ASP_ACTIVE */ f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(rctxA))); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40569?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: I6bee0f890a8baaa62be193824b1ae2fceb53fb45 Gerrit-Change-Number: 40569 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: bsc: generic: Introduce test TC_stat_msc_sctp_disconnected

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40486?usp=email ) Change subject: bsc: generic: Introduce test TC_stat_msc_sctp_disconnected ...................................................................... bsc: generic: Introduce test TC_stat_msc_sctp_disconnected Take the chance to properly configure all ASP/AS data statically, in order to be able to access them through VTY as well as have the setup properly documented in the config files. Change-Id: I028a16e2742ff0c58bf3b51ee1233ccf947a5a6a Related: OS#5917 Related: SYS#7501 --- M bsc/BSC_Tests.default M bsc/BSC_Tests.ttcn M bsc/BSC_Tests_SCCPlite.cfg M bsc/expected-results.xml M bsc/osmo-bsc-sccplite.cfg M bsc/osmo-bsc.cfg M bsc/osmo-stp.cfg 7 files changed, 147 insertions(+), 16 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.default b/bsc/BSC_Tests.default index 50c5c0a..65cc7c2 100644 --- a/bsc/BSC_Tests.default +++ b/bsc/BSC_Tests.default @@ -26,6 +26,15 @@ *.STATSVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" *.STATSVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.STATSVTY.PROMPT1 := "OsmoBSC> " +*.STPVTY.CTRL_MODE := "client" +*.STPVTY.CTRL_HOSTNAME := "127.0.0.1" +*.STPVTY.CTRL_PORTNUM := "4239" +*.STPVTY.CTRL_LOGIN_SKIPPED := "yes" +*.STPVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" +*.STPVTY.CTRL_READMODE := "buffered" +*.STPVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" +*.STPVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" +*.STPVTY.PROMPT1 := "OsmoSTP> " [MODULE_PARAMETERS] Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoBSC"; diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index ec1e983..d246b90 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -634,11 +634,14 @@ var MGCP_Emulation_CT vc_MGCP[NUM_MGW]; var integer g_nr_mgw; /* number of vc_MGCP to initialize */ port TELNETasp_PT BSCVTY; + port TELNETasp_PT STPVTY; /* StatsD */ var StatsD_Checker_CT vc_STATSD; var RAN_Adapter g_bssap[NUM_MSC]; + /* Configure/manage IPA_Emulation RAN_Adapter: */ + port IPA_CFG_PT SCCPLITE_IPA_CFG_PORT[NUM_MSC]; var BSSAP_LE_Adapter g_bssap_le; /* for old legacy-tests only */ port BSSAP_CODEC_PT BSSAP; @@ -1131,6 +1134,34 @@ "sccp-timer iar " & int2str(g_bsc_sccp_timer_iar)}); } +private function f_init_vty_stp() runs on test_CT { + if (STPVTY.checkstate("Mapped")) { + /* skip initialization if already executed once */ + return; + } + map(self:STPVTY, system:STPVTY); + f_vty_set_prompts(STPVTY, prompt_prefix := "OsmoSTP"); + f_vty_transceive(STPVTY, "enable"); +} + +private function f_vty_stp_bsc_asp_cmd(charstring cmd) runs on test_CT +{ + var charstring asp_name; + var charstring loc_port; + var charstring rem_port; + var charstring asp_proto; + if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) { + asp_name := "bsc0-0"; + loc_port := int2str(1905); + rem_port := int2str(2905); + asp_proto := "m3ua"; + } else { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "osmo-stp not used in SCCPLite!"); + } + var charstring asp_node := "asp " & asp_name & " " & loc_port & " " & rem_port & " " & asp_proto; + f_vty_config2(STPVTY, {"cs7 instance 0", asp_node}, cmd); +} + private function f_sysinfo_seen(integer rsl_idx, RSL_Message rsl) runs on test_CT { if (rsl_idx >= lengthof(g_system_information)) { @@ -1212,10 +1243,16 @@ var RanOps ranops := MSC_RanOps; ranops.use_osmux := g_osmux_enabled_cn; f_ran_adapter_init(g_bssap[bssap_idx], mp_bssap_cfg[bssap_idx], "VirtMSC", ranops); + if (isbound(g_bssap[bssap_idx].vc_IPA)) { + connect(self:SCCPLITE_IPA_CFG_PORT[bssap_idx], g_bssap[bssap_idx].vc_IPA:CFG_PORT); + } connect(self:SCCPLITE_IPA_CTRL, g_bssap[bssap_idx].vc_RAN:CTRL_CLIENT); f_ran_adapter_start(g_bssap[bssap_idx]); } else { f_ran_adapter_init(g_bssap[bssap_idx], mp_bssap_cfg[bssap_idx], "VirtMSC", omit); + if (isbound(g_bssap[bssap_idx].vc_IPA)) { + connect(self:SCCPLITE_IPA_CFG_PORT[bssap_idx], g_bssap[bssap_idx].vc_IPA:CFG_PORT); + } connect(self:BSSAP, g_bssap[bssap_idx].vc_SCCP:SCCP_SP_PORT); f_ran_adapter_start(g_bssap[bssap_idx]); f_legacy_bssap_reset(); @@ -1223,7 +1260,21 @@ } private function f_bssap_idx_disconnect(integer bssap_idx) runs on test_CT { - f_ran_adapter_cleanup(g_bssap[bssap_idx]); + var IPL4asp_Types.Result res := { + errorCode := omit, + connId := omit, + os_error_code := omit, + os_error_text := omit + }; + + if (isbound(g_bssap[bssap_idx].vc_IPA)) { + /* Alive components don't finish sockets (TCP FIN) when they are + * stopped. Hence, we need to manually call close() on them to make sure + * the IUT knows about it. */ + f_ipa_cfg_disconnect(SCCPLITE_IPA_CFG_PORT[bssap_idx], res); + } else { + f_ran_adapter_cleanup(g_bssap[bssap_idx]); + } } /* global initialization function @@ -3221,6 +3272,62 @@ f_tc_stat_num_msc_connected_test_ct(refers(f_tc_stat_num_msc_connected_3), 3); } +/* When the last local IPA/SCTP link/ASP is terminated, last AS goes inactive + * and a SCCP N-PCSTATE.ind (unavailable) should arrive to upper layers. + * As a result, osmo-bsc should immediately mark the MSC link as unusable. + * The scenario is slightly different in AoIP and SCCPLite: + * - AoIP: the SCCP N-PCSTATE is triggered by instructing the STP to + * shutdown the ASP serving the BSC, which will close the SCTP assoc between + * itself and IUT (BSC), which should then generate an N-PCSTATE.ind. + * - SCCPLite: Since osmo-bsc is connected directly to us (TTCN3), terminate our + * local SCTP conn to trigger the actions. + */ +testcase TC_stat_msc_sctp_disconnected() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var integer exp_total_num_msc; + + f_init(nr_bts := 1, handler_mode := true, nr_msc := 1); + if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) { + exp_total_num_msc := NUM_MSC; + f_init_vty_stp(); + } else { + exp_total_num_msc := 1; + } + f_sleep(1.0); + + f_ctrs_msc_init(); + + f_ctrl_get_exp(IPA_CTRL, "stat_item.last.bsc.0.num_msc:connected", int2str(1)); + f_ctrl_get_exp(IPA_CTRL, "stat_item.last.bsc.0.num_msc:total", int2str(exp_total_num_msc)); + + if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) { + f_logp(BSCVTY, "Shutting down BSC ASP in STP"); + f_vty_stp_bsc_asp_cmd("shutdown"); + } else { + f_logp(BSCVTY, "Disconnecting msc0"); + f_bssap_idx_disconnect(0); + } + + /* Wait for AS PENDING ->INACTIVE transition (T(r) timeout after 2000msec): */ + + f_ctrl_exp_trap(IPA_CTRL, "msc." & int2str(0) & ".connection_status", "disconnected", timeout_val := 5.0); + f_ctrl_get_exp(IPA_CTRL, "stat_item.last.bsc.0.num_msc:connected", int2str(0)); + f_ctrl_get_exp(IPA_CTRL, "stat_item.last.bsc.0.num_msc:total", int2str(exp_total_num_msc)); + + if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) { + f_logp(BSCVTY, "Restarting BSC ASP in STP"); + f_vty_stp_bsc_asp_cmd("no shutdown"); + } else { + f_logp(BSCVTY, "Waiting for bsc to reconnect to msc0"); + } + + f_ctrl_exp_trap(IPA_CTRL, "msc." & int2str(0) & ".connection_status", "connected", timeout_val := 10.0); + f_ctrl_get_exp(IPA_CTRL, "stat_item.last.bsc.0.num_msc:connected", int2str(1)); + f_ctrl_get_exp(IPA_CTRL, "stat_item.last.bsc.0.num_msc:total", int2str(exp_total_num_msc)); + + f_shutdown_helper(); +} + /* Verify correct stats on the number of configured and connected MSCs */ private function f_tc_stat_num_bts_connected_msc_connhdlr(integer expect_num_bts_connected) runs on MSC_ConnHdlr { var integer num_trx_connected := 0; @@ -9266,7 +9373,13 @@ f_shutdown_helper(); } -/* When an MSC point-code gets an SCCP N-PCSTATE saying it is unreachable, immediately mark the MSC as unusable. */ +/* When a peer point-code gets an SCCP N-PCSTATE saying it is unreachable, + * immediately mark the MSC link as unusable. + * In this scenario, the SCCP N-PCSTATE is triggered by locally dropping the + * SCTP assoc at the virtual MSC (TTCN3). When STP osmo-bsc finds out about + * the SCTP conn STP<->MSC going down, it will send an M3UA DUNA to the IUT + * (BSC) which should then generate an N-PCSTATE.ind. + */ testcase TC_mscpool_sccp_n_pcstate_detaches_msc() runs on test_CT { f_init(nr_bts := 3, handler_mode := true, nr_msc := 2); @@ -12588,6 +12701,7 @@ execute( TC_stat_num_bts_connected_1() ); execute( TC_stat_num_bts_connected_2() ); execute( TC_stat_num_bts_connected_3() ); + execute( TC_stat_msc_sctp_disconnected() ); execute( TC_ctrl() ); if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_SCCPlite_SERVER) { execute( TC_ctrl_location() ); diff --git a/bsc/BSC_Tests_SCCPlite.cfg b/bsc/BSC_Tests_SCCPlite.cfg index 00f44b3..db0b4cd 100644 --- a/bsc/BSC_Tests_SCCPlite.cfg +++ b/bsc/BSC_Tests_SCCPlite.cfg @@ -17,7 +17,7 @@ { transport := BSSAP_TRANSPORT_SCCPlite_SERVER, sccp_service_type := "mtp3_itu", - sctp_addr := { 5000, "127.0.0.1", -1, "" }, + sctp_addr := { 5000, "127.0.0.1", 4000, "" }, own_pc := 185, /* 0.23.1 first MSC emulation */ own_ssn := 254, peer_pc := 187, /* 0.23.3 osmo-bsc */ diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index 93432b9..7569056 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -8,6 +8,7 @@ <testcase classname='BSC_Tests' name='TC_stat_num_bts_connected_1' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_stat_num_bts_connected_2' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_stat_num_bts_connected_3' time='MASKED'/> + <testcase classname='BSC_Tests' name='TC_stat_msc_sctp_disconnected' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_ctrl' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_ctrl_location' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_si_default' time='MASKED'/> diff --git a/bsc/osmo-bsc-sccplite.cfg b/bsc/osmo-bsc-sccplite.cfg index f8dc619..8e6c72f 100644 --- a/bsc/osmo-bsc-sccplite.cfg +++ b/bsc/osmo-bsc-sccplite.cfg @@ -27,14 +27,14 @@ no e1_line 0 keepalive cs7 instance 0 point-code 0.23.3 - asp asp-clnt-msc-0 5000 0 ipa + asp asp-clnt-msc-0 5000 4000 ipa remote-ip 127.0.0.1 role asp sctp-role client as as-clnt-msc-0 ipa asp asp-clnt-msc-0 routing-key 0 0.23.3 - point-code override dpc 0.23.1 + point-code override dpc 0.23.3 network network country code 1 mobile network code 1 diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg index a03aeaf..6722fea 100644 --- a/bsc/osmo-bsc.cfg +++ b/bsc/osmo-bsc.cfg @@ -58,9 +58,11 @@ remote-ip 127.0.0.1 role asp sctp-role client - sccp-address msc2 + sccp-address msc0 + point-code 0.23.1 + sccp-address msc1 point-code 0.0.2 - sccp-address msc3 + sccp-address msc2 point-code 0.0.3 network network country code 1 @@ -481,6 +483,7 @@ timeslot 7 phys_chan_config PDCH msc 0 + msc-addr msc0 allow-emergency allow amr-config 12_2k forbidden amr-config 10_2k forbidden @@ -493,9 +496,9 @@ codec-list fr1 fr2 fr3 hr1 hr3 lcls-mode mgw-loop msc 1 - msc-addr msc2 + msc-addr msc1 msc 2 - msc-addr msc3 + msc-addr msc2 network nri bitlen 10 diff --git a/bsc/osmo-stp.cfg b/bsc/osmo-stp.cfg index 14b7a29..861e75d 100644 --- a/bsc/osmo-stp.cfg +++ b/bsc/osmo-stp.cfg @@ -27,14 +27,20 @@ ! cs7 instance 0 xua rkm routing-key-allocation dynamic-permitted + asp bsc0-0 1905 2905 m3ua + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as bsc0 m3ua + routing-key 0 0.23.3 + asp bsc0-0 + asp virt-msc0-0 23905 2905 m3ua local-ip 127.0.0.1 remote-ip 127.0.0.1 role sg sctp-role server - as mahlzeit ipa - routing-key 0 0.23.4 - point-code override dpc 0.23.1 as virt-msc0 m3ua asp virt-msc0-0 routing-key 1 0.23.1 @@ -67,13 +73,11 @@ routing-key 6 0.23.6 route-table system + update route 0.23.3 7.255.7 linkset bsc0 update route 0.23.1 7.255.7 linkset virt-msc0 update route 0.0.2 7.255.7 linkset virt-msc1 update route 0.0.3 7.255.7 linkset virt-msc2 update route 0.23.6 7.255.7 linkset virt-smlc listen m3ua 2905 - accept-asp-connections dynamic-permitted - local-ip 127.0.0.1 - listen ipa 5000 - accept-asp-connections dynamic-permitted + accept-asp-connections pre-configured local-ip 127.0.0.1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40486?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: I028a16e2742ff0c58bf3b51ee1233ccf947a5a6a Gerrit-Change-Number: 40486 Gerrit-PatchSet: 5 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-Reviewer: pespin <pespin(a)sysmocom.de>

4 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: xua_rkm: Simplify handle_rkey_reg() with early return path

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40572?usp=email ) Change subject: xua_rkm: Simplify handle_rkey_reg() with early return path ...................................................................... xua_rkm: Simplify handle_rkey_reg() with early return path Change-Id: I6f848716e9239dc4a4f0b35297462dd3915502c2 --- M src/xua_rkm.c 1 file changed, 10 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/xua_rkm.c b/src/xua_rkm.c index f03397c..d4d1aa3 100644 --- a/src/xua_rkm.c +++ b/src/xua_rkm.c @@ -219,6 +219,15 @@ /* check if there is already an AS for this routing key */ as = osmo_ss7_as_find_by_rctx(asp->inst, rctx); + + if (!as && !asp->inst->cfg.permit_dyn_rkm_alloc) { + /* not permitted to create dynamic RKM entries */ + LOGPASP(asp, DLSS7, LOGL_NOTICE, "RKM: RCTX %u not found in configuration, and " + "dynamic RKM allocation not permitted; permission denied\n", rctx); + msgb_append_reg_res(resp, rk_id, M3UA_RKM_REG_ERR_PERM_DENIED, 0); + return -1; + } + if (as) { LOGPASP(asp, DLSS7, LOGL_NOTICE, "RKM: Found existing AS for RCTX %u\n", rctx); /* Early return before allocating stuff if no space left: */ @@ -251,7 +260,7 @@ } as->cfg.mode_set_by_peer = true; } - } else if (asp->inst->cfg.permit_dyn_rkm_alloc) { + } else { /* Early return before allocating stuff if no space left: */ if (*nas_idx >= max_nas_idx) { LOGPASP(asp, DLSS7, LOGL_ERROR, "RKM: not enough room for newly assigned AS (max %u AS)\n", @@ -288,12 +297,6 @@ msgb_append_reg_res(resp, rk_id, M3UA_RKM_REG_ERR_CANT_SUPP_UNQ_RT, 0); return -1; } - } else { - /* not permitted to create dynamic RKM entries */ - LOGPASP(asp, DLSS7, LOGL_NOTICE, "RKM: RCTX %u not found in configuration, and " - "dynamic RKM allocation not permitted; permission denied\n", rctx); - msgb_append_reg_res(resp, rk_id, M3UA_RKM_REG_ERR_PERM_DENIED, 0); - return -1; } /* Success: Add just-create AS to connected ASP + report success */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40572?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: I6f848716e9239dc4a4f0b35297462dd3915502c2 Gerrit-Change-Number: 40572 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2025