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

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Use static sigtran config between osmo-hnbgw and osmo-stp

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40624?usp=email ) Change subject: hnbgw: Use static sigtran config between osmo-hnbgw and osmo-stp ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40624?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: Icbec561e28db8e0da19a284b3ba73636ea5c8210 Gerrit-Change-Number: 40624 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Jul 2025 11:42:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 5 days

1
0
0 0

[M] Change in libosmo-sigtran[master]: Submit SCRC Routing Failure indications asynchronously

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40615?usp=email ) Change subject: Submit SCRC Routing Failure indications asynchronously ...................................................................... Submit SCRC Routing Failure indications asynchronously Submitting CL/CO messages down the stack (SCOC/SCLC -> SCRC) may trigger a Routing Failure in the opposite direction up the stack. Until recently, due to missing logic, it was (almost?) impossible to trigger such a Routing Failure path in our code. Since recently, though, we can run over them, and so far we are generating those indications in a synchronously manner, which means upper layers in libosmo-sigtran and even in user applications we may receive a callback with such Routing Indication (or derived N-PCSTATE.ind) while still waiting for return of the initiaring request. This causes a lot of unexpected trouble and unintended behavior in both libosmo-sigtran SCOC/SCLC as well as user applications. Hence, instead, defer the triggering of such Routing Failure indications SCRC -> SCOC/SCLC so that they are submitted in event loop context later on, when upper layers are done updating its status. Related: OS#6790 Change-Id: I17ae7174f7ffee8c9a004435e522803a97d4fb7b --- M src/sccp_instance.c M src/sccp_instance.h M src/sccp_internal.h M src/sccp_scrc.c M src/xua_msg.c M src/xua_msg.h 6 files changed, 91 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/sccp_instance.c b/src/sccp_instance.c index 08274a5..1a9e02c 100644 --- a/src/sccp_instance.c +++ b/src/sccp_instance.c @@ -207,6 +207,52 @@ return sccp_user_bind_pc(inst, name, prim_cb, ssn, OSMO_SS7_PC_INVALID); } +/* Timer cb used to transmit queued Routing Failures asynchronously up the stack */ +static void rout_fail_pending_cb(void *_inst) +{ + struct osmo_sccp_instance *inst = _inst; + struct sccp_pending_rout_fail *prf; + + while ((prf = llist_first_entry_or_null(&inst->rout_fail_pending.queue, struct sccp_pending_rout_fail, list))) { + struct xua_msg *xua = prf->xua; + uint32_t cause = prf->cause; + bool scoc = prf->scoc; + llist_del(&prf->list); + talloc_free(prf); + if (scoc) /* Routing Failure SCRC -> SCOC */ + sccp_scoc_rx_scrc_rout_fail(inst, xua, cause); + else /* Routing Failure SCRC -> SCLC */ + sccp_sclc_rx_scrc_rout_fail(inst, xua, cause); + xua_msg_free(xua); + } +} + +/* Enqueue Routing Failure to submit it asynchronously to upper layers. + * xua_msg is copied. + * scoc: true if it's for SCOC, false if it's for SCLC. */ +void sccp_rout_fail_enqueue(struct osmo_sccp_instance *inst, const struct xua_msg *xua, uint32_t cause, bool scoc) +{ + bool queue_was_empty = llist_empty(&inst->rout_fail_pending.queue); + struct sccp_pending_rout_fail *prf; + + LOGPSCI(inst, LOGL_DEBUG, "Enqueuing SCRC Routing Failure (%s) for %s message %s\n", + osmo_sccp_return_cause_name(cause), + scoc ? "CO" : "CL", + xua_hdr_dump(xua, &xua_dialect_sua)); + + prf = talloc(inst, struct sccp_pending_rout_fail); + OSMO_ASSERT(prf); + *prf = (struct sccp_pending_rout_fail){ + .xua = xua_msg_copy(xua), + .cause = cause, + .scoc = scoc, + }; + OSMO_ASSERT(prf->xua); + llist_add_tail(&prf->list, &inst->rout_fail_pending.queue); + + if (queue_was_empty) + osmo_timer_schedule(&inst->rout_fail_pending.timer, 0, 0); +} /* prim_cb handed to MTP code for incoming MTP-TRANSFER.ind */ static int mtp_user_prim_cb(struct osmo_prim_hdr *oph, void *ctx) @@ -268,6 +314,9 @@ sizeof(osmo_sccp_timer_defaults)); osmo_tdefs_reset(inst->tdefs); + osmo_timer_setup(&inst->rout_fail_pending.timer, rout_fail_pending_cb, inst); + INIT_LLIST_HEAD(&inst->rout_fail_pending.queue); + rc = sccp_scmg_init(inst); if (rc < 0) { talloc_free(inst); @@ -297,6 +346,10 @@ osmo_sccp_user_unbind(scu); } OSMO_ASSERT(RB_EMPTY_ROOT(&inst->connections)); /* assert is empty */ + + osmo_timer_del(&inst->rout_fail_pending.timer); + /* Note: All entries in inst->rout_fail_pending.queue are freed by talloc. */ + llist_del(&inst->list); talloc_free(inst); } diff --git a/src/sccp_instance.h b/src/sccp_instance.h index a3f6750..2005d7a 100644 --- a/src/sccp_instance.h +++ b/src/sccp_instance.h @@ -35,6 +35,14 @@ static inline const char *osmo_sccp_timer_name(enum osmo_sccp_timer val) { return get_value_string(osmo_sccp_timer_names, val); } +struct sccp_pending_rout_fail { + /* Item in inst->rout_fail_pending.queue: */ + struct llist_head list; + struct xua_msg *xua; + uint32_t cause; + bool scoc; /* true if it's for SCOC, false if it's for SCLC. */ +}; + /* an instance of the SCCP stack */ struct osmo_sccp_instance { /* entry in global list of ss7 instances */ @@ -55,6 +63,12 @@ struct osmo_tdef *tdefs; uint32_t max_optional_data; + + /* Queued Routing Failures to transmit asynchronously up the stack: */ + struct { + struct osmo_timer_list timer; + struct llist_head queue; + } rout_fail_pending; }; struct osmo_sccp_user * diff --git a/src/sccp_internal.h b/src/sccp_internal.h index 8a69e19..045e49b 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -58,6 +58,9 @@ void sccp_sclc_rx_scrc_rout_fail(struct osmo_sccp_instance *inst, struct xua_msg *xua, uint32_t cause); +/* Route Failure from SCRX -> SCOC or SCLC */ +void sccp_rout_fail_enqueue(struct osmo_sccp_instance *inst, const struct xua_msg *xua, uint32_t cause, bool scoc); + /* SCU -> SCLC */ int sccp_sclc_user_sap_down(struct osmo_sccp_user *scu, struct osmo_prim_hdr *oph); int sccp_sclc_user_sap_down_nofree(struct osmo_sccp_user *scu, struct osmo_prim_hdr *oph); diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index fdbfd3c..e28e584 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -262,16 +262,14 @@ if (!dpc_accessible(inst, called.pc)) { /* Error: MTP Failure */ /* Routing Failure SCRC -> SCOC */ - sccp_scoc_rx_scrc_rout_fail(inst, xua, - SCCP_RETURN_CAUSE_MTP_FAILURE); + sccp_rout_fail_enqueue(inst, xua, SCCP_RETURN_CAUSE_MTP_FAILURE, true); return 0; } /* Is SCCP available? */ if (!sccp_available(inst, &called)) { /* Error: SCCP Failure */ /* Routing Failure SCRC -> SCOC */ - sccp_scoc_rx_scrc_rout_fail(inst, xua, - SCCP_RETURN_CAUSE_SCCP_FAILURE); + sccp_rout_fail_enqueue(inst, xua, SCCP_RETURN_CAUSE_SCCP_FAILURE, true); return 0; } return scrc_node_12(inst, xua, &called); @@ -305,10 +303,10 @@ /* TODO: Routing Failure SCRC -> OMAP */ if (sua_is_connectionless(xua)) { /* Routing Failure SCRC -> SCLC */ - sccp_sclc_rx_scrc_rout_fail(inst, xua, return_cause); + sccp_rout_fail_enqueue(inst, xua, return_cause, false); } else { /* Routing Failure SCRC -> SCOC */ - sccp_scoc_rx_scrc_rout_fail(inst, xua, return_cause); + sccp_rout_fail_enqueue(inst, xua, return_cause, true); } return 0; } @@ -335,8 +333,7 @@ LOGPSCI(inst, LOGL_NOTICE, "GT Routing not implemented yet\n"); #if 1 /* Prevent endless recursion, see OS#2666. */ - sccp_sclc_rx_scrc_rout_fail(inst, xua, - SCCP_RETURN_CAUSE_SUBSYSTEM_FAILURE); + sccp_rout_fail_enqueue(inst, xua, SCCP_RETURN_CAUSE_SUBSYSTEM_FAILURE, false); return 0; #else /* Node 7 (Sheet 5) */ @@ -386,12 +383,10 @@ /* TODO: SCRC -> SSPC */ if (sua_is_connectionless(xua)) { /* Routing Failure SCRC -> SCLC */ - sccp_sclc_rx_scrc_rout_fail(inst, xua, - SCCP_RETURN_CAUSE_SUBSYSTEM_FAILURE); + sccp_rout_fail_enqueue(inst, xua, SCCP_RETURN_CAUSE_SUBSYSTEM_FAILURE, false); } else { /* Routing Failure SCRC -> SCOC */ - sccp_scoc_rx_scrc_rout_fail(inst, xua, - SCCP_RETURN_CAUSE_SUBSYSTEM_FAILURE); + sccp_rout_fail_enqueue(inst, xua, SCCP_RETURN_CAUSE_SUBSYSTEM_FAILURE, true); } return 0; } diff --git a/src/xua_msg.c b/src/xua_msg.c index bc2a4f7..0652277 100644 --- a/src/xua_msg.c +++ b/src/xua_msg.c @@ -58,6 +58,19 @@ talloc_free(msg); } +struct xua_msg *xua_msg_copy(const struct xua_msg *xua_in) +{ + struct xua_msg_part *part; + struct xua_msg *xua_cpy = xua_msg_alloc(); + + xua_cpy->hdr = xua_in->hdr; + xua_cpy->mtp = xua_in->mtp; + + llist_for_each_entry(part, &xua_in->headers, entry) + xua_msg_add_data(xua_cpy, part->tag, part->len, part->dat); + return xua_cpy; +} + int xua_msg_add_data(struct xua_msg *msg, uint16_t tag, uint16_t len, const uint8_t *dat) { diff --git a/src/xua_msg.h b/src/xua_msg.h index 8311d60..f5d5de4 100644 --- a/src/xua_msg.h +++ b/src/xua_msg.h @@ -74,6 +74,7 @@ struct xua_msg *xua_msg_alloc(void); void xua_msg_free(struct xua_msg *msg); +struct xua_msg *xua_msg_copy(const struct xua_msg *xua_in); int xua_msg_add_data(struct xua_msg *msg, uint16_t tag, uint16_t len, const uint8_t *dat); int xua_msg_add_u32_data(struct xua_msg *msg, uint16_t tag, uint16_t len, const uint8_t *dat); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40615?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: I17ae7174f7ffee8c9a004435e522803a97d4fb7b Gerrit-Change-Number: 40615 Gerrit-PatchSet: 2 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>

2 weeks, 5 days

1
0
0 0

[M] Change in libosmo-sigtran[master]: Submit SCRC Routing Failure indications asynchronously

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40615?usp=email ) Change subject: Submit SCRC Routing Failure indications asynchronously ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40615?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: I17ae7174f7ffee8c9a004435e522803a97d4fb7b Gerrit-Change-Number: 40615 Gerrit-PatchSet: 2 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> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 10 Jul 2025 11:36:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 5 days

1
0
0 0

[XS] Change in libosmo-sigtran[master]: xua_snm: Tx DUNA/DAVA to ASPs with single AS and no coordinated rctx

by pespin

Attention is currently required from: daniel, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40621?usp=email ) Change subject: xua_snm: Tx DUNA/DAVA to ASPs with single AS and no coordinated rctx ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: ping -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40621?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: Ibda223090e7d503d8501c50f4cdf0b8b8c65a724 Gerrit-Change-Number: 40621 Gerrit-PatchSet: 2 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Jul 2025 11:36:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

2 weeks, 5 days

1
0
0 0

[M] Change in libosmo-sigtran[master]: Submit SCRC Routing Failure indications asynchronously

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40615?usp=email ) Change subject: Submit SCRC Routing Failure indications asynchronously ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > My point was that if we generically would enqueue all upward primitives at the SCCP user SAP, we wou […] Yes, that would be the other approach, but since this is basically the only primitive going back upwards synchronously, it has the advantage that then we are not generating an extra select() call for each message we transmit to lower layer (including also user data). So for now this is the less invasive and more performant approach. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40615?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: I17ae7174f7ffee8c9a004435e522803a97d4fb7b Gerrit-Change-Number: 40615 Gerrit-PatchSet: 2 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: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 10 Jul 2025 11:34: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>

2 weeks, 5 days

1
0
0 0

[M] Change in osmo-hnbgw[master]: Make sure MSC/SGSN PC are added to sccp-addressbook

by pespin

Attention is currently required from: daniel, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40627?usp=email ) Change subject: Make sure MSC/SGSN PC are added to sccp-addressbook ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > So far the philosophy was that the defaults apply if nothing else is configured explicitly by the us […] The previous behavior still holds true in the sense that the default is only applied upon start of the cnlink if no config is found. The difference is that now a default entry is created in the book instead of running without an entry. So IMHO the current behavior is more similar in both user-config and no-user-config, which is better. If the user later on decides to specify its own address in the address book it can be done by creating the new address entry and then if wished removing the default address with "no sccp-address" VTY command. The default sccp address will only be recreated and used if there's still some cnlink which has no address configured. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40627?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: master Gerrit-Change-Id: I6a537adca27dd2bbad33d0f2be71eb41d6ad3a27 Gerrit-Change-Number: 40627 Gerrit-PatchSet: 1 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Jul 2025 11:31:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

2 weeks, 5 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Use static sigtran config between osmo-hnbgw and osmo-stp

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40624?usp=email ) Change subject: hnbgw: Use static sigtran config between osmo-hnbgw and osmo-stp ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40624?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: Icbec561e28db8e0da19a284b3ba73636ea5c8210 Gerrit-Change-Number: 40624 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Jul 2025 11:17:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 5 days

1
0
0 0

[XS] Change in libosmo-netif[master]: osmux: Use while loop to tear down entire llist

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-netif/+/40628?usp=email ) Change subject: osmux: Use while loop to tear down entire llist ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/40628?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Id98619b1e91f12b0febf40118113bb53bd526702 Gerrit-Change-Number: 40628 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Jul 2025 11:16:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 5 days

1
0
0 0

[S] Change in libosmo-sigtran[master]: vty: Make sure user doesn't configure AS in ASP role with a non-local...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40586?usp=email ) Change subject: vty: Make sure user doesn't configure AS in ASP role with a non-local PC as routing-key ...................................................................... vty: Make sure user doesn't configure AS in ASP role with a non-local PC as routing-key AS in ASP mode doesn't expect to route incomign traffic to other nodes. They are expected to announce its routing-key (local PC) to the SG so it knows how to reach it and in turn announce (un)availability to other SG/ASPs in the network. Change-Id: Ibbf990fd8dcbdc67ebc4118597b34a5767320cf6 --- M src/ss7_as_vty.c M src/ss7_vty.c M src/ss7_vty.h 3 files changed, 14 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/ss7_as_vty.c b/src/ss7_as_vty.c index 0b0ddc1..e94e0c2 100644 --- a/src/ss7_as_vty.c +++ b/src/ss7_as_vty.c @@ -581,6 +581,18 @@ struct osmo_ss7_as *as = vty->index; vty->node = L_CS7_NODE; vty->index = as->inst; + + /* Config sanity checks: */ + + /* AS in ASP role should be configured with a local PC which they can + * then announce using RKM. + * Still, allow STPs to have AS(P) configured in an ASP mode to talk to a + * peer STP by announcing remove PCs. */ + if (cs7_role == CS7_ROLE_ASP && + ss7_as_get_local_role(as) == OSMO_SS7_ASP_ROLE_ASP && + !osmo_ss7_pc_is_local(as->inst, as->cfg.routing_key.pc)) + vty_out(vty, "%% AS with local role ASP should have a local PC configured in its routing-key. Fix your config!%s", VTY_NEWLINE); + return 0; } diff --git a/src/ss7_vty.c b/src/ss7_vty.c index d774236..b333c7f 100644 --- a/src/ss7_vty.c +++ b/src/ss7_vty.c @@ -76,7 +76,7 @@ * Core CS7 Configuration ***********************************************************************/ -static enum cs7_role_t cs7_role; +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 3bafffd..18dc5a6 100644 --- a/src/ss7_vty.h +++ b/src/ss7_vty.h @@ -18,6 +18,7 @@ }; 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/+/40586?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: Ibbf990fd8dcbdc67ebc4118597b34a5767320cf6 Gerrit-Change-Number: 40586 Gerrit-PatchSet: 2 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>

2 weeks, 5 days

1
0
0 0

[XS] Change in libosmo-sigtran[master]: Improve logging receiving Routing Failure

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40612?usp=email ) Change subject: Improve logging receiving Routing Failure ...................................................................... Improve logging receiving Routing Failure Change-Id: Ic7f9fd18e55b673b8be86b5459afefa8abd07628 --- M src/sccp_sclc.c M src/sccp_scoc.c 2 files changed, 5 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/sccp_sclc.c b/src/sccp_sclc.c index 88574c0..c7dce89 100644 --- a/src/sccp_sclc.c +++ b/src/sccp_sclc.c @@ -396,6 +396,10 @@ { struct xua_msg *xua_out; + LOGPSCI(inst, LOGL_NOTICE, "SCRC Routing Failure (%s) for CL message %s\n", + osmo_sccp_return_cause_name(cause), + xua_hdr_dump(xua_in, &xua_dialect_sua)); + /* Figure C.12/Q.714 (Sheet 8) Node 9 */ switch (xua_in->hdr.msg_type) { case SUA_CL_CLDT: diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index fa96803..817f785 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -503,7 +503,7 @@ uint32_t conn_id; struct sccp_connection *conn; - LOGPSCI(inst, LOGL_NOTICE, "SCRC Routing Failure (%s) for message %s\n", + LOGPSCI(inst, LOGL_NOTICE, "SCRC Routing Failure (%s) for CO message %s\n", osmo_sccp_return_cause_name(return_cause), xua_hdr_dump(xua, &xua_dialect_sua)); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40612?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: Ic7f9fd18e55b673b8be86b5459afefa8abd07628 Gerrit-Change-Number: 40612 Gerrit-PatchSet: 2 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>

2 weeks, 5 days

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2025