pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41505?usp=email )
Change subject: xua_rkm: remove unneeded check rkm_dyn_allocated
......................................................................
xua_rkm: remove unneeded check rkm_dyn_allocated
This is always true, as per checks done further above in the same
function.
Change-Id: I2977ddd4aa476172e61b76f7a6501f0af9d25062
---
M src/xua_rkm.c
1 file changed, 4 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/05/41505/1
diff --git a/src/xua_rkm.c b/src/xua_rkm.c
index 44a0eb3..d88fda7 100644
--- a/src/xua_rkm.c
+++ b/src/xua_rkm.c
@@ -428,13 +428,10 @@
* we should refuse RKM DEREG if the ASP is still ACTIVE */
osmo_fsm_inst_dispatch(as->fi, XUA_ASPAS_ASP_DOWN_IND, asp);
- /* if we were dynamically allocated, release the associated
- * route and destroy the AS */
- if (as->rkm_dyn_allocated) {
- /* remove route + AS definition */
- ss7_route_destroy(rt);
- osmo_ss7_as_destroy(as);
- }
+ /* Release the associated route and destroy the dynamically allocated AS */
+ ss7_route_destroy(rt);
+ osmo_ss7_as_destroy(as);
+
/* report success */
msgb_append_dereg_res(resp, M3UA_RKM_DEREG_SUCCESS, rctx);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41505?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: I2977ddd4aa476172e61b76f7a6501f0af9d25062
Gerrit-Change-Number: 41505
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41500?usp=email )
Change subject: ss7_xua_server_destroy(): Disconnect streams properly
......................................................................
ss7_xua_server_destroy(): Disconnect streams properly
destroying ASPs is wrong, since that'd also destroy non-dynamic ASPs,
hence erasing the configuration.
Instead, close oly the stream, and dynamic ASPs get destroyed as a
consequence.
Change-Id: I1309015053d2bd22d8fdf6298f8918a47527340e
---
M src/ss7_xua_srv.c
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
diff --git a/src/ss7_xua_srv.c b/src/ss7_xua_srv.c
index 077eea0..a97b07f 100644
--- a/src/ss7_xua_srv.c
+++ b/src/ss7_xua_srv.c
@@ -397,11 +397,13 @@
if (xs->server) {
osmo_stream_srv_link_close(xs->server);
osmo_stream_srv_link_destroy(xs->server);
+ xs->server = NULL;
}
- /* iterate and close all connections established in relation
- * with this server */
+
+ /* iterate and close all connections established in relation with this server.
+ * Dynamic ASPs in SCTP=server are destroyed when connection is closed. */
llist_for_each_entry_safe(asp, asp2, &xs->asp_list, siblings)
- osmo_ss7_asp_destroy(asp);
+ ss7_asp_disconnect_stream(asp);
llist_del(&xs->list);
talloc_free(xs);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41500?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: I1309015053d2bd22d8fdf6298f8918a47527340e
Gerrit-Change-Number: 41500
Gerrit-PatchSet: 2
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-Reviewer: pespin <pespin(a)sysmocom.de>
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41499?usp=email )
Change subject: ss7_asp: Do AS-eSLS table cleanup during osmo_ss7_asp_destroy()
......................................................................
ss7_asp: Do AS-eSLS table cleanup during osmo_ss7_asp_destroy()
Use the existing API to cleanly remove the association between ASP and
AS.
Change-Id: I2c1b25d3e76703b88111b9935685a58d039b8e23
---
M src/ss7_asp.c
1 file changed, 3 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
diff --git a/src/ss7_asp.c b/src/ss7_asp.c
index 644c192..5325de9 100644
--- a/src/ss7_asp.c
+++ b/src/ss7_asp.c
@@ -760,13 +760,9 @@
llist_del(&asp->siblings);
/* unlink from all ASs we are part of */
- llist_for_each_entry(as, &asp->inst->as_list, list) {
- unsigned int i;
- for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) {
- if (as->cfg.asps[i] == asp)
- as->cfg.asps[i] = NULL;
- }
- }
+ llist_for_each_entry(as, &asp->inst->as_list, list)
+ ss7_as_del_asp(as, asp);
+
/* unlink from ss7_instance */
asp->inst = NULL;
llist_del(&asp->list);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41499?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: I2c1b25d3e76703b88111b9935685a58d039b8e23
Gerrit-Change-Number: 41499
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41498?usp=email )
Change subject: xua_rkm: Avoid unnecesary ASP lookup by name
......................................................................
xua_rkm: Avoid unnecesary ASP lookup by name
Change-Id: I5ca8f0180a0389d5de7b495cfe9f769985296383
---
M src/ss7_as.c
M src/ss7_as.h
M src/xua_rkm.c
3 files changed, 19 insertions(+), 8 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/src/ss7_as.c b/src/ss7_as.c
index c2dee9d..cd6d66a 100644
--- a/src/ss7_as.c
+++ b/src/ss7_as.c
@@ -194,16 +194,10 @@
* \param[in] as Application Server from which \ref asp is deleted
* \param[in] asp Application Server Process to delete from \ref as
* \returns 0 on success; negative in case of error */
-int osmo_ss7_as_del_asp(struct osmo_ss7_as *as, const char *asp_name)
+int ss7_as_del_asp(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp)
{
- struct osmo_ss7_asp *asp;
unsigned int i;
- OSMO_ASSERT(ss7_initialized);
- asp = osmo_ss7_asp_find_by_name(as->inst, asp_name);
- if (!asp)
- return -ENODEV;
-
LOGPAS(as, DLSS7, LOGL_INFO, "Removing ASP %s from AS\n", asp->cfg.name);
/* Remove route from AS-eSLS table: */
@@ -224,6 +218,22 @@
return -EINVAL;
}
+/*! \brief Delete given ASP from given AS
+ * \param[in] as Application Server from which \ref asp is deleted
+ * \param[in] asp_name Name of the Application Server Process to delete from \ref as
+ * \returns 0 on success; negative in case of error */
+int osmo_ss7_as_del_asp(struct osmo_ss7_as *as, const char *asp_name)
+{
+ struct osmo_ss7_asp *asp;
+
+ OSMO_ASSERT(ss7_initialized);
+ asp = osmo_ss7_asp_find_by_name(as->inst, asp_name);
+ if (!asp)
+ return -ENODEV;
+
+ return ss7_as_del_asp(as, asp);
+}
+
/*! \brief Destroy given Application Server
* \param[in] as Application Server to destroy */
void osmo_ss7_as_destroy(struct osmo_ss7_as *as)
diff --git a/src/ss7_as.h b/src/ss7_as.h
index 4f5db78..bb7b1b2 100644
--- a/src/ss7_as.h
+++ b/src/ss7_as.h
@@ -137,6 +137,7 @@
unsigned int osmo_ss7_as_count_asp(const struct osmo_ss7_as *as);
int ss7_as_add_asp(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp);
+int ss7_as_del_asp(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp);
int ss7_as_get_local_role(const struct osmo_ss7_as *as);
void ss7_as_loadshare_binding_table_reset(struct osmo_ss7_as *as);
diff --git a/src/xua_rkm.c b/src/xua_rkm.c
index 8817f49..44a0eb3 100644
--- a/src/xua_rkm.c
+++ b/src/xua_rkm.c
@@ -423,7 +423,7 @@
rctx, osmo_ss7_pointcode_print(inst, as->cfg.routing_key.pc));
/* remove ASP from AS */
- osmo_ss7_as_del_asp(as, asp->cfg.name);
+ ss7_as_del_asp(as, asp);
/* FIXME: Rather than spoofing teh ASP-DOWN.ind to the AS here,
* we should refuse RKM DEREG if the ASP is still ACTIVE */
osmo_fsm_inst_dispatch(as->fi, XUA_ASPAS_ASP_DOWN_IND, asp);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41498?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: I5ca8f0180a0389d5de7b495cfe9f769985296383
Gerrit-Change-Number: 41498
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/41504?usp=email )
Change subject: ASCI: Fix establishment of calls when ciphering is enabled
......................................................................
ASCI: Fix establishment of calls when ciphering is enabled
We do not support any VGCS/VBS ciphering. If the CM Service Request
indicates VGCS or VBS service, encryption is not enabled for the channel
to be set up. There will be no Ciphering Command sent to the ME.
Authentication is still performed with the initiator of the call, if
authentication is enabled. Only authenticated subscribers will then be
able to initiate ASCI calls.
Change-Id: Ic59221e6b0f64c9f19508ae31cc3672548d0666e
---
M src/libvlr/vlr_access_req_fsm.c
1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/04/41504/1
diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c
index 91ff06e..4a1c854 100644
--- a/src/libvlr/vlr_access_req_fsm.c
+++ b/src/libvlr/vlr_access_req_fsm.c
@@ -301,9 +301,12 @@
LOGPFSM(fi, "%s()\n", __func__);
/* Continue with ciphering, if enabled.
- * If auth/ciph is optional and the HLR returned no auth info, continue without ciphering. */
+ * If auth/ciph is optional and the HLR returned no auth info, continue without ciphering.
+ * Also continue without ciphering, if ASCI call was requested. */
if (!is_cmc_smc_to_be_attempted(par)
- || (vsub->sec_ctx == VLR_SEC_CTX_NONE && !par->is_ciphering_required)) {
+ || (vsub->sec_ctx == VLR_SEC_CTX_NONE && !par->is_ciphering_required)
+ || par->cm_service_type == GSM48_CMSERV_VGCS
+ || par->cm_service_type == GSM48_CMSERV_VBS) {
_proc_arq_vlr_node2_post_ciph(fi);
return;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41504?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Ic59221e6b0f64c9f19508ae31cc3672548d0666e
Gerrit-Change-Number: 41504
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Attention is currently required from: pespin.
fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41501?usp=email )
Change subject: ss7_xua_srv: Make sure we don't accept conns for ASPs configured as transport-role client
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41501?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: I955aed3c6cdaa0a7eaa14150eeb7458ee9b41d9d
Gerrit-Change-Number: 41501
Gerrit-PatchSet: 2
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: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 25 Nov 2025 13:26:06 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes