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

[XS] Change in libosmo-sigtran[master]: ipa: tear down conn trying to add >16th ASP to AS

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40575?usp=email ) Change subject: ipa: tear down conn trying to add >16th ASP to AS ...................................................................... ipa: tear down conn trying to add >16th ASP to AS If a user tries to add more than 16 ASPs to an AS, it will fail internally. In that scenario, close the connection. Change-Id: Iaf02f69c7a53827037ec500ce946b947ab5ea2bd --- M src/xua_asp_fsm.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: daniel: 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 Jenkins Builder: Verified diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 86d86b7..70fb0b3 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -1124,7 +1124,11 @@ iafp->ipa_unit->unit_name); goto out_err; } - ss7_as_add_asp(as, asp); + rc = ss7_as_add_asp(as, asp); + if (rc < 0) { + LOGPFSML(fi, LOGL_ERROR, "Cannot add ASP '%s' to AS '%s'\n", asp->cfg.name, as->cfg.name); + goto out_err; + } /* TODO: OAP Authentication? */ /* Send ID_ACK */ if (fd >= 0) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40575?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: Iaf02f69c7a53827037ec500ce946b947ab5ea2bd Gerrit-Change-Number: 40575 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: xua_rkm: Reply RKM RKEY REG with err insufficient resources

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40574?usp=email ) Change subject: xua_rkm: Reply RKM RKEY REG with err insufficient resources ...................................................................... xua_rkm: Reply RKM RKEY REG with err insufficient resources If a user tries to add more than 16 ASPs to an AS, it will fail internally. In that scenario, inform the peer. Change-Id: I352dbc0a1319348b127e173599a1d967ef7bcb26 --- M src/xua_rkm.c 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/src/xua_rkm.c b/src/xua_rkm.c index 1009d18..8817f49 100644 --- a/src/xua_rkm.c +++ b/src/xua_rkm.c @@ -309,7 +309,12 @@ } /* Success: Add just-create AS to connected ASP + report success */ - ss7_as_add_asp(as, asp); + if (ss7_as_add_asp(as, asp) < 0) { + LOGPASP(asp, DLSS7, LOGL_ERROR, "RKM: Cannot associate ASP to AS %s\n", as->cfg.name); + msgb_append_reg_res(resp, rk_id, M3UA_RKM_REG_ERR_INSUFF_RESRC, 0); + return -1; + } + msgb_append_reg_res(resp, rk_id, M3UA_RKM_REG_SUCCESS, rctx); /* append to list of newly assigned as */ if (!as_already_in_array) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40574?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: I352dbc0a1319348b127e173599a1d967ef7bcb26 Gerrit-Change-Number: 40574 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: ipa: tear down conn trying to add >16th ASP to AS

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40575?usp=email ) Change subject: ipa: tear down conn trying to add >16th ASP to AS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40575?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: Iaf02f69c7a53827037ec500ce946b947ab5ea2bd Gerrit-Change-Number: 40575 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Jul 2025 20:11:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: xua_rkm: Improve handling of newly_assigned_as array

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40573?usp=email ) Change subject: xua_rkm: Improve handling of newly_assigned_as array ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40573?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: I4fbac8ff61541c6804e2f01a9c965ec630d59080 Gerrit-Change-Number: 40573 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Jul 2025 20:11:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: sccp: Free connections of sccp_user when unbinding it

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40583?usp=email ) Change subject: sccp: Free connections of sccp_user when unbinding it ...................................................................... sccp: Free connections of sccp_user when unbinding it Implement FIXME in code. Once we unbind the user, they cannot be used anymore anyway, so we end up with dangling SCCP conns. By binding again we would be potentially recieving previous connection stuff, which is not really what the user expects. Related: OS#6793 Change-Id: Ide694646e971043b60e232dcdc82b145af03dc91 --- M src/sccp_instance.c M src/sccp_user.c M src/sccp_user.h 3 files changed, 29 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/83/40583/1 diff --git a/src/sccp_instance.c b/src/sccp_instance.c index 10ef570..08274a5 100644 --- a/src/sccp_instance.c +++ b/src/sccp_instance.c @@ -284,16 +284,6 @@ return inst; } -static void sccp_flush_connections(struct osmo_sccp_instance *inst) -{ - struct rb_node *node; - while ((node = rb_first(&inst->connections))) { - struct sccp_connection *conn = container_of(node, struct sccp_connection, node); - sccp_conn_free(conn); - } - -} - void osmo_sccp_instance_destroy(struct osmo_sccp_instance *inst) { struct osmo_sccp_user *scu, *scu2; @@ -306,7 +296,7 @@ llist_for_each_entry_safe(scu, scu2, &inst->users, list) { osmo_sccp_user_unbind(scu); } - sccp_flush_connections(inst); + OSMO_ASSERT(RB_EMPTY_ROOT(&inst->connections)); /* assert is empty */ llist_del(&inst->list); talloc_free(inst); } diff --git a/src/sccp_user.c b/src/sccp_user.c index 2ec2f28..fac01cb 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -37,6 +37,7 @@ #include <osmocom/sigtran/sccp_helpers.h> #include <osmocom/sccp/sccp_types.h> +#include "sccp_connection.h" #include "sccp_instance.h" #include "sccp_internal.h" #include "sccp_user.h" @@ -64,15 +65,38 @@ return scu; } +static void sccp_user_flush_connections(struct osmo_sccp_user *scu) +{ + struct osmo_sccp_instance *inst = scu->inst; + struct rb_node *node; + +start: + for (node = rb_first(&inst->connections); node; node = rb_next(node)) { + struct sccp_connection *conn = container_of(node, struct sccp_connection, node); + if (conn->user == scu) { + sccp_conn_free(conn); + /* node has been freed, rbtree has been changed, start again: */ + goto start; + } + } +} + +void sccp_user_free(struct osmo_sccp_user *scu) +{ + if (!scu) + return; + sccp_user_flush_connections(scu); + llist_del(&scu->list); + talloc_free(scu); +} + /*! \brief Unbind a given SCCP user * \param[in] scu SCCP User which is to be un-bound. Will be destroyed * at the time this function returns. */ void osmo_sccp_user_unbind(struct osmo_sccp_user *scu) { LOGPSCU(scu, LOGL_INFO, "Unbinding user\n"); - /* FIXME: free/release all connections held by this user? */ - llist_del(&scu->list); - talloc_free(scu); + sccp_user_free(scu); } void osmo_sccp_user_set_priv(struct osmo_sccp_user *scu, void *priv) diff --git a/src/sccp_user.h b/src/sccp_user.h index 95b37ee..47c8aa4 100644 --- a/src/sccp_user.h +++ b/src/sccp_user.h @@ -34,6 +34,7 @@ struct osmo_sccp_user *sccp_user_alloc(struct osmo_sccp_instance *inst, const char *name, osmo_prim_cb prim_cb, uint16_t ssn, uint32_t pc); +void sccp_user_free(struct osmo_sccp_user *scu); int sccp_user_prim_up(struct osmo_sccp_user *scut, struct osmo_scu_prim *prim); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40583?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: Ide694646e971043b60e232dcdc82b145af03dc91 Gerrit-Change-Number: 40583 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: ipa: tear down conn trying to add >16th ASP to AS

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40575?usp=email ) Change subject: ipa: tear down conn trying to add >16th ASP to AS ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40575?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: Iaf02f69c7a53827037ec500ce946b947ab5ea2bd Gerrit-Change-Number: 40575 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Jul 2025 20:01:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 2 weeks

1
0
0 0

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

by daniel

Attention is currently required from: laforge, osmith, pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40579?usp=email ) Change subject: ss7_vty: Avoid adding rote to local PC in role ASP ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmo-sigtran/+/40579/comment/0fe71563_9a232… : PS1, Line 7: rote route -- 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: comment 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> 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Jul 2025 19:59:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

2 months, 2 weeks

1
0
0 0

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

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40578?usp=email ) Change subject: cosmetic: Fix typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- 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: comment 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> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Jul 2025 19:57:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 2 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: xua_rkm: Reply RKM RKEY REG with err insufficient resources

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40574?usp=email ) Change subject: xua_rkm: Reply RKM RKEY REG with err insufficient resources ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40574?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: I352dbc0a1319348b127e173599a1d967ef7bcb26 Gerrit-Change-Number: 40574 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Jul 2025 19:56:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: xua_rkm: Improve handling of newly_assigned_as array

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40573?usp=email ) Change subject: xua_rkm: Improve handling of newly_assigned_as array ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40573?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: I4fbac8ff61541c6804e2f01a9c965ec630d59080 Gerrit-Change-Number: 40573 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Jul 2025 19:55:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2025