- gerrit-log - lists.osmocom.org

[M] Change in libosmocore[master]: logging: Support nonblocking-io for log target stderr & file, make it...
by pespin 09 Feb '26

09 Feb '26

Attention is currently required from: fixeria, laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/42088?usp=email ) Change subject: logging: Support nonblocking-io for log target stderr & file, make it default ...................................................................... Patch Set 3: (2 comments) File src/core/logging_file.c: https://gerrit.osmocom.org/c/libosmocore/+/42088/comment/892b0ad9_a972518a?… : PS2, Line 129: confiured > configured Done https://gerrit.osmocom.org/c/libosmocore/+/42088/comment/0da72e98_dd30fa1a?… : PS2, Line 131: otherse > otherwise Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/42088?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I46420f4b174d3a9ed01e993e2e89aea3b46c0dd7 Gerrit-Change-Number: 42088 Gerrit-PatchSet: 3 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 09 Feb 2026 14:47:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in pysim[master]: esim/http_json_api: add alternative API interface
by neels 09 Feb '26

09 Feb '26

Attention is currently required from: dexter. neels has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/42043?usp=email ) Change subject: esim/http_json_api: add alternative API interface ...................................................................... Patch Set 6: (2 comments) Patchset: PS6: I would vote for a simpler approach, without needing to interfere with class instantiation: choose a different class name for the new client, leave the "legacy" class as-is, except, if needed, moving some bits to a new base class that old and new implementations can inherit from. IMHO that should be far easier to read and maintain. File pySim/esim/http_json_api.py: https://gerrit.osmocom.org/c/pysim/+/42043/comment/7f2a94a1_dc29af89?usp=em… : PS6, Line 224: cls_attr = { attr_name: getattr(cls, attr_name) for attr_name in dir(cls) if not match("__.*__", attr_name) } if not attr_name.startswith('__') -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42043?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: I2a5d4b59b12e08d5eae7a1215814d3a69c8921f6 Gerrit-Change-Number: 42043 Gerrit-PatchSet: 6 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 09 Feb 2026 14:32:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in libosmo-sigtran[master]: xua_default_lm_fsm: Move timer_cb further below
by pespin 09 Feb '26

09 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42060?usp=email ) Change subject: xua_default_lm_fsm: Move timer_cb further below ...................................................................... xua_default_lm_fsm: Move timer_cb further below As usually done in osmo_fsm implemnetations. Change-Id: Ibdc04d9ece0b3955da44849755a87ec28c17f140 --- M src/xua_default_lm_fsm.c 1 file changed, 51 insertions(+), 52 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index 9c64ec4..2346ffb 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -185,58 +185,6 @@ } } - -static int lm_timer_cb(struct osmo_fsm_inst *fi) -{ - struct xua_layer_manager_default_priv *lmp = fi->priv; - struct osmo_xlm_prim *prim; - struct osmo_ss7_as *as; - - switch (fi->T) { - case SS7_ASP_LM_T_WAIT_ASP_UP: - /* we have been waiting for the ASP to come up, but it - * failed to do so */ - LOGPFSML(fi, LOGL_NOTICE, "Peer didn't send any ASP_UP in time! Restarting ASP\n"); - ss7_asp_disconnect_stream(lmp->asp); - break; - case SS7_ASP_LM_T_WAIT_NOTIFY: - if (lmp->asp->cfg.quirks & OSMO_SS7_ASP_QUIRK_NO_NOTIFY) { - /* some implementations don't send the NOTIFY which they SHOULD - * according to RFC4666 (see OS#5145) */ - LOGPFSM(fi, "quirk no_notify active; locally emulate AS-INACTIVE.ind\n"); - osmo_fsm_inst_dispatch(fi, LM_E_AS_INACTIVE_IND, NULL); - break; - } - /* No AS has reported via NOTIFY that is was - * (statically) configured at the SG for this ASP, so - * let's dynamically register */ - lm_fsm_state_chg(fi, S_RKM_REG); - prim = xua_xlm_prim_alloc(OSMO_XLM_PRIM_M_RK_REG, PRIM_OP_REQUEST); - OSMO_ASSERT(prim); - as = find_first_as_in_asp(lmp->asp); - if (!as) { - LOGPFSML(fi, LOGL_ERROR, "Unable to find AS!\n"); - ss7_asp_disconnect_stream(lmp->asp); - return 0; - } - /* Fill in settings from first AS (TODO: multiple AS support) */ - prim->u.rk_reg.key = as->cfg.routing_key; - prim->u.rk_reg.traf_mode = as->cfg.mode; - osmo_xlm_sap_down(lmp->asp, &prim->oph); - break; - case SS7_ASP_LM_T_WAIT_NOTIY_RKM: - /* No AS has reported via NOTIFY even after dynamic RKM - * configuration */ - ss7_asp_disconnect_stream(lmp->asp); - break; - case SS7_ASP_LM_T_WAIT_RK_REG_RESP: - /* timeout of registration of routing key */ - ss7_asp_disconnect_stream(lmp->asp); - break; - } - return 0; -} - static void lm_wait_notify(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct xua_layer_manager_default_priv *lmp = fi->priv; @@ -327,6 +275,57 @@ } } +static int lm_timer_cb(struct osmo_fsm_inst *fi) +{ + struct xua_layer_manager_default_priv *lmp = fi->priv; + struct osmo_xlm_prim *prim; + struct osmo_ss7_as *as; + + switch (fi->T) { + case SS7_ASP_LM_T_WAIT_ASP_UP: + /* we have been waiting for the ASP to come up, but it + * failed to do so */ + LOGPFSML(fi, LOGL_NOTICE, "Peer didn't send any ASP_UP in time! Restarting ASP\n"); + ss7_asp_disconnect_stream(lmp->asp); + break; + case SS7_ASP_LM_T_WAIT_NOTIFY: + if (lmp->asp->cfg.quirks & OSMO_SS7_ASP_QUIRK_NO_NOTIFY) { + /* some implementations don't send the NOTIFY which they SHOULD + * according to RFC4666 (see OS#5145) */ + LOGPFSM(fi, "quirk no_notify active; locally emulate AS-INACTIVE.ind\n"); + osmo_fsm_inst_dispatch(fi, LM_E_AS_INACTIVE_IND, NULL); + break; + } + /* No AS has reported via NOTIFY that is was + * (statically) configured at the SG for this ASP, so + * let's dynamically register */ + lm_fsm_state_chg(fi, S_RKM_REG); + prim = xua_xlm_prim_alloc(OSMO_XLM_PRIM_M_RK_REG, PRIM_OP_REQUEST); + OSMO_ASSERT(prim); + as = find_first_as_in_asp(lmp->asp); + if (!as) { + LOGPFSML(fi, LOGL_ERROR, "Unable to find AS!\n"); + ss7_asp_disconnect_stream(lmp->asp); + return 0; + } + /* Fill in settings from first AS (TODO: multiple AS support) */ + prim->u.rk_reg.key = as->cfg.routing_key; + prim->u.rk_reg.traf_mode = as->cfg.mode; + osmo_xlm_sap_down(lmp->asp, &prim->oph); + break; + case SS7_ASP_LM_T_WAIT_NOTIY_RKM: + /* No AS has reported via NOTIFY even after dynamic RKM + * configuration */ + ss7_asp_disconnect_stream(lmp->asp); + break; + case SS7_ASP_LM_T_WAIT_RK_REG_RESP: + /* timeout of registration of routing key */ + ss7_asp_disconnect_stream(lmp->asp); + break; + } + return 0; +} + static const struct osmo_fsm_state lm_states[] = { [S_IDLE] = { .in_event_mask = S(LM_E_SCTP_EST_IND), -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42060?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: Ibdc04d9ece0b3955da44849755a87ec28c17f140 Gerrit-Change-Number: 42060 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>

1 0

[M] Change in libosmo-sigtran[master]: Refactor xua_layer_manager object
by pespin 09 Feb '26

09 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42054?usp=email ) Change subject: Refactor xua_layer_manager object ...................................................................... Refactor xua_layer_manager object Several changes to improve separation of the LM object and its lifecycle: * Store in ss7_asp a pointer to a xua_layer_manager, which contains all implementation dependent information inside its priv pointer. * Add a new free_func field to the xua_layer_manager struct in order to be able to free it without knowing how it was allocated. * Get rid og the loglevel param, LOGL_DEBUG was always passed and that was actually an implementation specific detail of the default xua layer manager. * Pass pointer to function to be called by LM to submit primitives to M3UA. Change-Id: Ia96ebf40444f46ad718d61befbecb523f267fd6c --- M include/osmocom/sigtran/osmo_ss7.h M src/ss7_asp.c M src/ss7_asp.h M src/xua_default_lm_fsm.c 4 files changed, 69 insertions(+), 51 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 9ea929f..162994e 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -295,7 +295,6 @@ void osmo_ss7_asp_destroy(struct osmo_ss7_asp *asp); int osmo_ss7_asp_send(struct osmo_ss7_asp *asp, struct msgb *msg); int osmo_ss7_asp_restart(struct osmo_ss7_asp *asp); -int osmo_ss7_asp_use_default_lm(struct osmo_ss7_asp *asp, int log_level); bool osmo_ss7_asp_active(const struct osmo_ss7_asp *asp); int osmo_ss7_asp_get_log_subsys(const struct osmo_ss7_asp *asp); const char *osmo_ss7_asp_get_name(const struct osmo_ss7_asp *asp); diff --git a/src/ss7_asp.c b/src/ss7_asp.c index f91a51f..4314081 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -699,6 +699,29 @@ return NULL; } +static void ss7_asp_xua_layer_manager_start(struct osmo_ss7_asp *asp) +{ + OSMO_ASSERT(!asp->lm); + if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA || + asp->cfg.role != OSMO_SS7_ASP_ROLE_ASP || + asp->cfg.is_server) + return; + + asp->lm = xua_layer_manager_default_alloc(asp); + OSMO_ASSERT(asp->lm); +} + +/* Apply default LM FSM */ +static void ss7_asp_xua_layer_manager_destroy(struct osmo_ss7_asp *asp) +{ + if (!asp->lm) + return; + + if (asp->lm->free_func) + asp->lm->free_func(asp->lm); + asp->lm = NULL; +} + struct osmo_ss7_asp *ss7_asp_alloc(struct osmo_ss7_instance *inst, const char *name, uint16_t remote_port, uint16_t local_port, int trans_proto, enum osmo_ss7_asp_protocol proto) @@ -758,7 +781,7 @@ osmo_stream_cli_destroy(asp->client); if (asp->fi) osmo_fsm_inst_term(asp->fi, OSMO_FSM_TERM_REQUEST, NULL); - osmo_ss7_asp_remove_default_lm(asp); + ss7_asp_xua_layer_manager_destroy(asp); /* Unlink from all ASs we are part of. * Some RKM-dynamically allocated ASs may be freed as a result from this: */ @@ -907,14 +930,9 @@ OSMO_ASSERT(!asp->fi); } - /* Apply default LM FSM for client ASP */ - if (asp->cfg.proto != OSMO_SS7_ASP_PROT_IPA && - asp->cfg.role == OSMO_SS7_ASP_ROLE_ASP && - !asp->cfg.is_server) { - osmo_ss7_asp_use_default_lm(asp, LOGL_DEBUG); - } else { - osmo_ss7_asp_remove_default_lm(asp); - } + /* Restart existing Layer Manager: */ + ss7_asp_xua_layer_manager_destroy(asp); + ss7_asp_xua_layer_manager_start(asp); if ((rc = xua_asp_fsm_start(asp, LOGL_DEBUG)) < 0) return rc; diff --git a/src/ss7_asp.h b/src/ss7_asp.h index 0e156f2..459163f 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -21,11 +21,15 @@ struct osmo_ss7_instance; struct osmo_xua_layer_manager { - /* oph: {sap: XUA_SAP_LM, prim: enum osmo_xlm_prim_type}, + /* Submit primitives M3UA -> LM: + * oph: {sap: XUA_SAP_LM, prim: enum osmo_xlm_prim_type}, * cb_data: (struct osmo_ss7_asp *) */ osmo_prim_cb prim_cb; + void (*free_func)(struct osmo_xua_layer_manager *lm); + void *priv; }; +struct osmo_xua_layer_manager *xua_layer_manager_default_alloc(struct osmo_ss7_asp *asp); enum ss7_asp_xua_timer { /* 0 kept unused on purpose since it's handled specially by osmo_fsm */ @@ -77,8 +81,7 @@ bool remote_asp_id_present; /* Layer Manager to which we talk */ - const struct osmo_xua_layer_manager *lm; - void *lm_priv; + struct osmo_xua_layer_manager *lm; /*! Were we dynamically allocated */ bool dyn_allocated; @@ -180,7 +183,6 @@ int ss7_asp_apply_drop_local_address(const struct osmo_ss7_asp *asp, unsigned int loc_idx); void ss7_asp_restart_after_reconfigure(struct osmo_ss7_asp *asp); -void osmo_ss7_asp_remove_default_lm(struct osmo_ss7_asp *asp); unsigned int ss7_asp_get_all_rctx(const struct osmo_ss7_asp *asp, uint32_t *rctx, unsigned int rctx_size, const struct osmo_ss7_as *excl_as); diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index 92a6ea2..9c64ec4 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -116,14 +116,15 @@ [S_ACTIVE] = { }, }; -struct lm_fsm_priv { +struct xua_layer_manager_default_priv { struct osmo_ss7_asp *asp; + struct osmo_fsm_inst *fi; }; #define lm_fsm_state_chg(fi, NEXT_STATE) \ osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, \ lm_fsm_timeouts, \ - ((struct lm_fsm_priv *)(fi->priv))->asp->cfg.T_defs_lm, \ + ((struct xua_layer_manager_default_priv *)(fi->priv))->asp->cfg.T_defs_lm, \ -1) static struct osmo_ss7_as *find_first_as_in_asp(struct osmo_ss7_asp *asp) @@ -144,7 +145,7 @@ /* handle an incoming RKM registration response */ static int handle_reg_conf(struct osmo_fsm_inst *fi, uint32_t l_rk_id, uint32_t rctx) { - struct lm_fsm_priv *lmp = fi->priv; + struct xua_layer_manager_default_priv *lmp = fi->priv; struct osmo_ss7_asp *asp = lmp->asp; struct osmo_ss7_as *as; @@ -162,7 +163,7 @@ static void lm_idle(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct lm_fsm_priv *lmp = fi->priv; + struct xua_layer_manager_default_priv *lmp = fi->priv; switch (event) { case LM_E_SCTP_EST_IND: @@ -187,7 +188,7 @@ static int lm_timer_cb(struct osmo_fsm_inst *fi) { - struct lm_fsm_priv *lmp = fi->priv; + struct xua_layer_manager_default_priv *lmp = fi->priv; struct osmo_xlm_prim *prim; struct osmo_ss7_as *as; @@ -238,7 +239,7 @@ static void lm_wait_notify(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct lm_fsm_priv *lmp = fi->priv; + struct xua_layer_manager_default_priv *lmp = fi->priv; struct osmo_xlm_prim *oxp = data; switch (event) { @@ -271,7 +272,7 @@ static void lm_rkm_reg(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct lm_fsm_priv *lmp = fi->priv; + struct xua_layer_manager_default_priv *lmp = fi->priv; struct osmo_xlm_prim *oxp; int rc; @@ -298,7 +299,7 @@ static void lm_active(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct lm_fsm_priv *lmp = fi->priv; + struct xua_layer_manager_default_priv *lmp = fi->priv; struct osmo_xlm_prim *oxp; switch (event) { @@ -396,7 +397,8 @@ static int default_lm_prim_cb(struct osmo_prim_hdr *oph, void *_asp) { struct osmo_ss7_asp *asp = _asp; - struct osmo_fsm_inst *fi = asp->lm_priv; + struct xua_layer_manager_default_priv *lmp = asp->lm->priv; + struct osmo_fsm_inst *fi = lmp->fi; uint32_t event = osmo_event_for_prim(oph, lm_event_map); char *prim_name = osmo_xlm_prim_name(oph); @@ -412,42 +414,39 @@ return 0; } -static const struct osmo_xua_layer_manager default_layer_manager = { - .prim_cb = default_lm_prim_cb, -}; - -void osmo_ss7_asp_remove_default_lm(struct osmo_ss7_asp *asp) +void xua_layer_manager_default_free(struct osmo_xua_layer_manager *lm) { - if (!asp->lm_priv) + if (!lm) return; - osmo_fsm_inst_term(asp->lm_priv, OSMO_FSM_TERM_ERROR, NULL); - asp->lm_priv = NULL; + if (lm->priv) { + struct xua_layer_manager_default_priv *lmp = lm->priv; + osmo_fsm_inst_term(lmp->fi, OSMO_FSM_TERM_ERROR, NULL); + talloc_free(lmp); + lm->priv = NULL; + } + talloc_free(lm); } -int osmo_ss7_asp_use_default_lm(struct osmo_ss7_asp *asp, int log_level) +struct osmo_xua_layer_manager *xua_layer_manager_default_alloc(struct osmo_ss7_asp *asp) { - struct lm_fsm_priv *lmp; - struct osmo_fsm_inst *fi; + struct osmo_xua_layer_manager *lm; + struct xua_layer_manager_default_priv *lmp; - if (asp->lm_priv) { - osmo_fsm_inst_term(asp->lm_priv, OSMO_FSM_TERM_ERROR, NULL); - asp->lm_priv = NULL; - } + lm = talloc_zero(asp, struct osmo_xua_layer_manager); + OSMO_ASSERT(lm); - fi = osmo_fsm_inst_alloc(&xua_default_lm_fsm, asp, NULL, log_level, asp->cfg.name); - if (!fi) - return -EINVAL; - - lmp = talloc_zero(fi, struct lm_fsm_priv); - if (!lmp) { - osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); - return -ENOMEM; - } + lmp = talloc_zero(lm, struct xua_layer_manager_default_priv); + OSMO_ASSERT(lmp); lmp->asp = asp; - fi->priv = lmp; + lmp->fi = osmo_fsm_inst_alloc(&xua_default_lm_fsm, lmp, lmp, LOGL_DEBUG, asp->cfg.name); + if (!lmp->fi) { + talloc_free(lm); + return NULL; + } - asp->lm = &default_layer_manager; - asp->lm_priv = fi; + lm->prim_cb = default_lm_prim_cb; + lm->free_func = xua_layer_manager_default_free; + lm->priv = lmp; - return 0; + return lm; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42054?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: Ia96ebf40444f46ad718d61befbecb523f267fd6c Gerrit-Change-Number: 42054 Gerrit-PatchSet: 3 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>

1 0

[XS] Change in libosmo-sigtran[master]: lm: Use layer manager also on transport-role=server
by pespin 09 Feb '26

09 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42059?usp=email ) Change subject: lm: Use layer manager also on transport-role=server ...................................................................... lm: Use layer manager also on transport-role=server The upper layers (M3UA) should behave similarly eg. on role ASP independently of transport role being client or server. Change-Id: I5f0109463323f214e15610b2c4fe253b828fce3b --- M src/ss7_asp.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/ss7_asp.c b/src/ss7_asp.c index 4314081..68c783e 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -703,8 +703,7 @@ { OSMO_ASSERT(!asp->lm); if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA || - asp->cfg.role != OSMO_SS7_ASP_ROLE_ASP || - asp->cfg.is_server) + asp->cfg.role != OSMO_SS7_ASP_ROLE_ASP) return; asp->lm = xua_layer_manager_default_alloc(asp); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42059?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: I5f0109463323f214e15610b2c4fe253b828fce3b Gerrit-Change-Number: 42059 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>

1 0

[XS] Change in libosmo-sigtran[master]: IPSP: don't route any incoming M3UA messages in IPSP case
by pespin 09 Feb '26

09 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42025?usp=email ) Change subject: IPSP: don't route any incoming M3UA messages in IPSP case ...................................................................... IPSP: don't route any incoming M3UA messages in IPSP case An IPSP is a point-to-point association, and we must not route any such messages. Change-Id: Iad7280619ec5814cda7a179418079048a5955976 --- M src/m3ua.c 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/src/m3ua.c b/src/m3ua.c index cad7889..42a9798 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -41,6 +41,7 @@ #include <osmocom/sigtran/protocol/sua.h> #include "mtp3_hmdc.h" +#include "mtp3_hmdt.h" #include "xua_as_fsm.h" #include "xua_asp_fsm.h" #include "xua_internal.h" @@ -667,8 +668,14 @@ xua_msg_free_tag(xua, M3UA_IEI_ROUTE_CTX); } + /* an IPSP by definition is a peer-to-peer service that doesn't + * use a signaling gateway, and hence doesn't route messages. + * See RFC 4666 Section 1.4.3.4. */ /* xua ownership is passed here: */ - return mtp3_hmdc_rx_from_l2(asp->inst, xua); + if (asp->cfg.role == OSMO_SS7_ASP_ROLE_IPSP) + return mtp3_hmdt_message_for_distribution(asp->inst, xua); + else + return mtp3_hmdc_rx_from_l2(asp->inst, xua); ret_free: xua_msg_free(xua); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42025?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: Iad7280619ec5814cda7a179418079048a5955976 Gerrit-Change-Number: 42025 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>

1 0

[XS] Change in libosmo-sigtran[master]: IPSP: Add a comment that it's intentional to drop all M3UA SNM for IPSP
by pespin 09 Feb '26

09 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42026?usp=email ) Change subject: IPSP: Add a comment that it's intentional to drop all M3UA SNM for IPSP ...................................................................... IPSP: Add a comment that it's intentional to drop all M3UA SNM for IPSP An IPSP doesn't have MTP3 network management. Change-Id: I7b87bf03964e7e9aac683ad860e511f83a685821 --- M src/m3ua.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/m3ua.c b/src/m3ua.c index 42a9798..44ae513 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -1149,6 +1149,8 @@ case OSMO_SS7_ASP_ROLE_ASP: rc = m3ua_rx_snm_asp(asp, xua); break; + case OSMO_SS7_ASP_ROLE_IPSP: + /* RFC 4666 Section 1.5.2: there is no MTP3 network management status information */ default: rc = M3UA_ERR_UNSUPP_MSG_CLASS; break; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42026?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: I7b87bf03964e7e9aac683ad860e511f83a685821 Gerrit-Change-Number: 42026 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>

1 0

[S] Change in libosmo-sigtran[master]: lm: Initialize layer manager also on role=SG
by pespin 09 Feb '26

09 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42062?usp=email ) Change subject: lm: Initialize layer manager also on role=SG ...................................................................... lm: Initialize layer manager also on role=SG Right now the LM will stay in IDLE for role=SG, but it already provides with an easier logic where all xUA ASPs (no matter their role) have an associated FSM object, which can be extnded later on. This way we already valdiate the FSM instance lifecycle wroks as expected. It also allows in the future more easily integrating the LM in role IPSP, where it will need to be extended. Change-Id: I1f25cf8371ba72d710796e01a9a967d3fafffb99 --- M src/ss7_asp.c M src/xua_default_lm_fsm.c 2 files changed, 7 insertions(+), 5 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/ss7_asp.c b/src/ss7_asp.c index 68c783e..5e96519 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -702,8 +702,8 @@ static void ss7_asp_xua_layer_manager_start(struct osmo_ss7_asp *asp) { OSMO_ASSERT(!asp->lm); - if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA || - asp->cfg.role != OSMO_SS7_ASP_ROLE_ASP) + /* No LM in IPA */ + if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA) return; asp->lm = xua_layer_manager_default_alloc(asp); diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index 2346ffb..3e364c1 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -167,9 +167,11 @@ switch (event) { case LM_E_SCTP_EST_IND: - /* Try to transition to ASP-UP, wait to receive message for a few seconds */ - lm_fsm_state_chg(fi, S_WAIT_ASP_UP); - osmo_fsm_inst_dispatch(lmp->asp->fi, XUA_ASP_E_M_ASP_UP_REQ, NULL); + if (lmp->asp->cfg.role == OSMO_SS7_ASP_ROLE_ASP) { + /* Try to transition to ASP-UP, wait to receive message for a few seconds */ + lm_fsm_state_chg(fi, S_WAIT_ASP_UP); + osmo_fsm_inst_dispatch(lmp->asp->fi, XUA_ASP_E_M_ASP_UP_REQ, NULL); + } break; } } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42062?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: I1f25cf8371ba72d710796e01a9a967d3fafffb99 Gerrit-Change-Number: 42062 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>

1 0

[XS] Change in libosmo-sigtran[master]: IPSP: Allow vty-configuration of IPSP role "ASPs"
by pespin 09 Feb '26

09 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42027?usp=email ) Change subject: IPSP: Allow vty-configuration of IPSP role "ASPs" ...................................................................... IPSP: Allow vty-configuration of IPSP role "ASPs" We should now have everything in place to support IPSP-SE, let's accept enabling IPSP role via the VTY. Change-Id: I0f0fa881471b87a4bb82a0211c6fb6e4c50b48ec --- M src/ss7_asp_vty.c 1 file changed, 2 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/ss7_asp_vty.c b/src/ss7_asp_vty.c index d54eb01..b7af9c9 100644 --- a/src/ss7_asp_vty.c +++ b/src/ss7_asp_vty.c @@ -414,15 +414,12 @@ { struct osmo_ss7_asp *asp = vty->index; - if (!strcmp(argv[0], "ipsp")) { - vty_out(vty, "IPSP role isn't supported yet%s", VTY_NEWLINE); - return CMD_WARNING; - } - if (!strcmp(argv[0], "sg")) asp->cfg.role = OSMO_SS7_ASP_ROLE_SG; else if (!strcmp(argv[0], "asp")) asp->cfg.role = OSMO_SS7_ASP_ROLE_ASP; + else if (!strcmp(argv[0], "ipsp")) + asp->cfg.role = OSMO_SS7_ASP_ROLE_IPSP; else OSMO_ASSERT(0); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42027?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: I0f0fa881471b87a4bb82a0211c6fb6e4c50b48ec Gerrit-Change-Number: 42027 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>

1 0

[S] Change in libosmo-sigtran[master]: vty: Prohibit configuring an ASP as IPSP in an SG node
by pespin 09 Feb '26

09 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42028?usp=email ) Change subject: vty: Prohibit configuring an ASP as IPSP in an SG node ...................................................................... vty: Prohibit configuring an ASP as IPSP in an SG node The spec explicitly prohibits it. Change-Id: I38bbd9226bad478f8068d02f7a4d7b3711596208 --- M src/ss7_asp_vty.c 1 file changed, 9 insertions(+), 4 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/ss7_asp_vty.c b/src/ss7_asp_vty.c index b7af9c9..27b7462 100644 --- a/src/ss7_asp_vty.c +++ b/src/ss7_asp_vty.c @@ -414,14 +414,19 @@ { struct osmo_ss7_asp *asp = vty->index; - if (!strcmp(argv[0], "sg")) + if (!strcmp(argv[0], "sg")) { asp->cfg.role = OSMO_SS7_ASP_ROLE_SG; - else if (!strcmp(argv[0], "asp")) + } else if (!strcmp(argv[0], "asp")) { asp->cfg.role = OSMO_SS7_ASP_ROLE_ASP; - else if (!strcmp(argv[0], "ipsp")) + } else if (!strcmp(argv[0], "ipsp")) { + if (cs7_role == CS7_ROLE_SG) { + vty_out(vty, "IPSP role can't be used in an SG node since they are point-to-point%s", VTY_NEWLINE); + return CMD_WARNING; + } asp->cfg.role = OSMO_SS7_ASP_ROLE_IPSP; - else + } else { OSMO_ASSERT(0); + } asp->cfg.role_set_by_vty = true; return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42028?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: I38bbd9226bad478f8068d02f7a4d7b3711596208 Gerrit-Change-Number: 42028 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>

1 0

2026

2025

2024

2023

2022

gerrit-log