- gerrit-log - lists.osmocom.org

[S] Change in pysim[master]: euicc: get_profiles_info: add additional tags
by laforge 05 Feb '26

05 Feb '26

Attention is currently required from: lynxis lazus. laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/pysim/+/42058?usp=email ) Change subject: euicc: get_profiles_info: add additional tags ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42058?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: I727dbe34d87a42bb3b526bd7a8accd687d20a208 Gerrit-Change-Number: 42058 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 05 Feb 2026 13:22:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in pysim[master]: euicc: get_profiles_info: add additional tags
by lynxis lazus 05 Feb '26

05 Feb '26

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42058?usp=email ) Change subject: euicc: get_profiles_info: add additional tags ...................................................................... euicc: get_profiles_info: add additional tags Add definitions for ProfileOwner (decoded), Notification Configuration Info, SM-DP+ proprietary data, Profile Policy Rules. Change-Id: I727dbe34d87a42bb3b526bd7a8accd687d20a208 --- M pySim/euicc.py 1 file changed, 20 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/58/42058/1 diff --git a/pySim/euicc.py b/pySim/euicc.py index 763d7ff..d09863a 100644 --- a/pySim/euicc.py +++ b/pySim/euicc.py @@ -226,9 +226,28 @@ _construct = GreedyBytes class ProfileClass(BER_TLV_IE, tag=0x95): _construct = Enum(Int8ub, test=0, provisioning=1, operational=2) +class ProfilePolicyRules(BER_TLV_IE, tag=0x99): + _construct = GreedyBytes +class NotificationConfigurationInfo(BER_TLV_IE, tag=0xb6): + _construct = GreedyBytes + +# ProfileOwner +class ProfileOwnerPLMN(BER_TLV_IE, tag=0x80): + _construct = PlmnAdapter(Bytes(3)) +class ProfileOwnerGID1(BER_TLV_IE, tag=0x81): + _construct = GreedyBytes +class ProfileOwnerGID2(BER_TLV_IE, tag=0x82): + _construct = GreedyBytes +class ProfileOwner(BER_TLV_IE, tag=0xb7, nested=[ProfileOwnerPLMN, ProfileOwnerGID1, ProfileOwnerGID2]): + _construct = GreedyBytes + +class SMDPPProprietaryData(BER_TLV_IE, tag=0xb8): + _construct = GreedyBytes + class ProfileInfo(BER_TLV_IE, tag=0xe3, nested=[Iccid, IsdpAid, ProfileState, ProfileNickname, ServiceProviderName, ProfileName, IconType, Icon, - ProfileClass]): # FIXME: more IEs + ProfileClass, ProfilePolicyRules, NotificationConfigurationInfo, + ProfileOwner, SMDPPProprietaryData]): pass class ProfileInfoSeq(BER_TLV_IE, tag=0xa0, nested=[ProfileInfo]): pass -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42058?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I727dbe34d87a42bb3b526bd7a8accd687d20a208 Gerrit-Change-Number: 42058 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in pysim[master]: euicc: extend get_profiles_info to retrieve all known tags
by lynxis lazus 05 Feb '26

05 Feb '26

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42057?usp=email ) Change subject: euicc: extend get_profiles_info to retrieve all known tags ...................................................................... euicc: extend get_profiles_info to retrieve all known tags get_profiles_info only request for the default tag list, but not all tags. Add --all to the function to request for all known tags. Change-Id: Ia6878519a480bd625bb1fa2567c1fd2e0e89b071 --- M pySim/euicc.py 1 file changed, 21 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/57/42057/1 diff --git a/pySim/euicc.py b/pySim/euicc.py index ccb65be..763d7ff 100644 --- a/pySim/euicc.py +++ b/pySim/euicc.py @@ -444,9 +444,28 @@ d = rn.to_dict() self._cmd.poutput_json(flatten_dict_lists(d['notification_sent_resp'])) - def do_get_profiles_info(self, _opts): + get_profiles_info_parser = argparse.ArgumentParser() + get_profiles_info_parser.add_argument('--all', action='store_true', help='Retrieve all known tags of a profile') + + @cmd2.with_argparser(get_profiles_info_parser) + def do_get_profiles_info(self, opts): """Perform an ES10c GetProfilesInfo function.""" - pi = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc, ProfileInfoListReq(), ProfileInfoListResp) + if opts.all: + tags = [nest.tag for nest in ProfileInfo.nested_collection_cls().nested] + u8tags = [] + # TODO: rework TagList to support 2 byte tags to not filter it into u8 tags + for tag in tags: + if tag <= 255: + u8tags.append(tag) + elif tag <= 65535: + u8tags.append(tag >> 8) + u8tags.append(tag & 0xff) + # Ignoring 3 byte tags + req = ProfileInfoListReq(children=[TagList(decoded=u8tags)]) + else: + req = ProfileInfoListReq() + + pi = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc, req, ProfileInfoListResp) d = pi.to_dict() self._cmd.poutput_json(flatten_dict_lists(d['profile_info_list_resp'])) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42057?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia6878519a480bd625bb1fa2567c1fd2e0e89b071 Gerrit-Change-Number: 42057 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

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

05 Feb '26

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42055?usp=email ) Change subject: Refactor xua_layer_manager object ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42055?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I5b101d3afa41712d895815b467eae58f52922476 Gerrit-Change-Number: 42055 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

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

05 Feb '26

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42054?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder 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, 55 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/54/42054/2 -- 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: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ia96ebf40444f46ad718d61befbecb523f267fd6c Gerrit-Change-Number: 42054 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

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

05 Feb '26

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42054?usp=email ) Change subject: Refactor xua_layer_manager object ...................................................................... Patch Set 1: This change is ready for review. -- 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: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ia96ebf40444f46ad718d61befbecb523f267fd6c Gerrit-Change-Number: 42054 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 05 Feb 2026 13:02:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 0

[M] Change in libosmo-sigtran[master]: Move osmo_xlm_sap_down to ss7_asp.c
by pespin 05 Feb '26

05 Feb '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42056?usp=email ) Change subject: Move osmo_xlm_sap_down to ss7_asp.c ...................................................................... Move osmo_xlm_sap_down to ss7_asp.c That's a generic function to interact with the ASP from the LM. Only some of the primitives are related to RKM. Change-Id: I9a8d0e0fc1fd193db8dd3901911848ed8564616f --- M src/ss7_asp.c M src/xua_internal.h M src/xua_rkm.c 3 files changed, 36 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/56/42056/1 diff --git a/src/ss7_asp.c b/src/ss7_asp.c index 6071317..4109325 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -1603,3 +1603,30 @@ } return tmode; } + +/* process a primitive from the xUA Layer Manager (LM) */ +int osmo_xlm_sap_down(struct osmo_ss7_asp *asp, struct osmo_prim_hdr *oph) +{ + struct osmo_xlm_prim *prim = (struct osmo_xlm_prim *) oph; + + LOGPASP(asp, DLSS7, LOGL_DEBUG, "Received XUA Layer Manager Primitive: %s)\n", + osmo_xlm_prim_name(&prim->oph)); + + switch (OSMO_PRIM_HDR(&prim->oph)) { + case OSMO_PRIM(OSMO_XLM_PRIM_M_RK_REG, PRIM_OP_REQUEST): + /* Layer Manager asks us to send a Routing Key Reg Request */ + xua_rkm_send_reg_req(asp, &prim->u.rk_reg.key, prim->u.rk_reg.traf_mode); + break; + case OSMO_PRIM(OSMO_XLM_PRIM_M_RK_DEREG, PRIM_OP_REQUEST): + /* Layer Manager asks us to send a Routing Key De-Reg Request */ + xua_rkm_send_dereg_req(asp, prim->u.rk_dereg.route_ctx); + break; + default: + LOGPASP(asp, DLSS7, LOGL_ERROR, "Unknown XUA Layer Manager Primitive: %s\n", + osmo_xlm_prim_name(&prim->oph)); + break; + } + + msgb_free(prim->oph.msg); + return 0; +} diff --git a/src/xua_internal.h b/src/xua_internal.h index a2f0af6..ebd1442 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -155,3 +155,8 @@ int osmo_sccp_addr_encode(struct msgb *msg, const struct osmo_sccp_addr *in); int ss7_asp_rx_unknown(struct osmo_ss7_asp *asp, int ppid_mux, struct msgb *msg); + +void xua_rkm_send_reg_req(struct osmo_ss7_asp *asp, + const struct osmo_ss7_routing_key *rkey, + enum osmo_ss7_as_traffic_mode traf_mode); +void xua_rkm_send_dereg_req(struct osmo_ss7_asp *asp, uint32_t route_ctx); diff --git a/src/xua_rkm.c b/src/xua_rkm.c index 038098f..21591e9 100644 --- a/src/xua_rkm.c +++ b/src/xua_rkm.c @@ -113,9 +113,9 @@ } /* ASP: send a RKM Registration Request message for a single routing key */ -static void xua_rkm_send_reg_req(struct osmo_ss7_asp *asp, - const struct osmo_ss7_routing_key *rkey, - enum osmo_ss7_as_traffic_mode traf_mode) +void xua_rkm_send_reg_req(struct osmo_ss7_asp *asp, + const struct osmo_ss7_routing_key *rkey, + enum osmo_ss7_as_traffic_mode traf_mode) { struct msgb *msg = m3ua_msgb_alloc(__func__); int tmod = osmo_ss7_tmode_to_xua(traf_mode); @@ -135,7 +135,7 @@ } /* ASP: send a RKM De-Registration Request message for a single routing context */ -static void xua_rkm_send_dereg_req(struct osmo_ss7_asp *asp, uint32_t route_ctx) +void xua_rkm_send_dereg_req(struct osmo_ss7_asp *asp, uint32_t route_ctx) { struct msgb *msg = m3ua_msgb_alloc(__func__); @@ -623,30 +623,3 @@ xua_msg_free(xua); return rc; } - -/* process a primitive from the xUA Layer Manager (LM) */ -int osmo_xlm_sap_down(struct osmo_ss7_asp *asp, struct osmo_prim_hdr *oph) -{ - struct osmo_xlm_prim *prim = (struct osmo_xlm_prim *) oph; - - LOGPASP(asp, DLSS7, LOGL_DEBUG, "Received XUA Layer Manager Primitive: %s)\n", - osmo_xlm_prim_name(&prim->oph)); - - switch (OSMO_PRIM_HDR(&prim->oph)) { - case OSMO_PRIM(OSMO_XLM_PRIM_M_RK_REG, PRIM_OP_REQUEST): - /* Layer Manager asks us to send a Routing Key Reg Request */ - xua_rkm_send_reg_req(asp, &prim->u.rk_reg.key, prim->u.rk_reg.traf_mode); - break; - case OSMO_PRIM(OSMO_XLM_PRIM_M_RK_DEREG, PRIM_OP_REQUEST): - /* Layer Manager asks us to send a Routing Key De-Reg Request */ - xua_rkm_send_dereg_req(asp, prim->u.rk_dereg.route_ctx); - break; - default: - LOGPASP(asp, DLSS7, LOGL_ERROR, "Unknown XUA Layer Manager Primitive: %s\n", - osmo_xlm_prim_name(&prim->oph)); - break; - } - - msgb_free(prim->oph.msg); - return 0; -} -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42056?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: I9a8d0e0fc1fd193db8dd3901911848ed8564616f Gerrit-Change-Number: 42056 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

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

05 Feb '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42055?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 Change-Id: I5b101d3afa41712d895815b467eae58f52922476 --- 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, 55 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/55/42055/1 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 ded2c67..6071317 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -758,7 +758,11 @@ 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); + if (asp->lm) { + if (asp->lm->free_func) + asp->lm->free_func(asp->lm); + asp->lm = NULL; + } /* Unlink from all ASs we are part of. * Some RKM-dynamically allocated ASs may be freed as a result from this: */ @@ -907,14 +911,18 @@ OSMO_ASSERT(!asp->fi); } + /* Remove existing LayerManager: */ + if (asp->lm) { + if (asp->lm->free_func) + asp->lm->free_func(asp->lm); + asp->lm = NULL; + } + /* 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); - } + !asp->cfg.is_server) + asp->lm = xua_layer_manager_default_alloc(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..aa60db2 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; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42055?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: I5b101d3afa41712d895815b467eae58f52922476 Gerrit-Change-Number: 42055 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

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

05 Feb '26

pespin has uploaded this change for review. ( 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. * get rid of struct lm_fsm_priv, it's not needed since it acutally only contain an asp pointer which can be passed directly as fi->priv. 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, 61 insertions(+), 66 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/54/42054/1 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 ded2c67..6071317 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -758,7 +758,11 @@ 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); + if (asp->lm) { + if (asp->lm->free_func) + asp->lm->free_func(asp->lm); + asp->lm = NULL; + } /* Unlink from all ASs we are part of. * Some RKM-dynamically allocated ASs may be freed as a result from this: */ @@ -907,14 +911,18 @@ OSMO_ASSERT(!asp->fi); } + /* Remove existing LayerManager: */ + if (asp->lm) { + if (asp->lm->free_func) + asp->lm->free_func(asp->lm); + asp->lm = NULL; + } + /* 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); - } + !asp->cfg.is_server) + asp->lm = xua_layer_manager_default_alloc(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..886d6c8 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -25,7 +25,10 @@ * 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 +80,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 +182,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..bd6f148 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -116,14 +116,10 @@ [S_ACTIVE] = { }, }; -struct lm_fsm_priv { - struct osmo_ss7_asp *asp; -}; - #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 osmo_ss7_asp *)(fi->priv))->cfg.T_defs_lm, \ -1) static struct osmo_ss7_as *find_first_as_in_asp(struct osmo_ss7_asp *asp) @@ -144,8 +140,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 osmo_ss7_asp *asp = lmp->asp; + struct osmo_ss7_asp *asp = fi->priv; struct osmo_ss7_as *as; /* update the application server with the routing context as @@ -162,13 +157,13 @@ static void lm_idle(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct lm_fsm_priv *lmp = fi->priv; + struct osmo_ss7_asp *asp = fi->priv; 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); + osmo_fsm_inst_dispatch(asp->fi, XUA_ASP_E_M_ASP_UP_REQ, NULL); break; } } @@ -187,7 +182,7 @@ static int lm_timer_cb(struct osmo_fsm_inst *fi) { - struct lm_fsm_priv *lmp = fi->priv; + struct osmo_ss7_asp *asp = fi->priv; struct osmo_xlm_prim *prim; struct osmo_ss7_as *as; @@ -196,10 +191,10 @@ /* 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); + ss7_asp_disconnect_stream(asp); break; case SS7_ASP_LM_T_WAIT_NOTIFY: - if (lmp->asp->cfg.quirks & OSMO_SS7_ASP_QUIRK_NO_NOTIFY) { + if (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"); @@ -212,25 +207,25 @@ 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); + as = find_first_as_in_asp(asp); if (!as) { LOGPFSML(fi, LOGL_ERROR, "Unable to find AS!\n"); - ss7_asp_disconnect_stream(lmp->asp); + ss7_asp_disconnect_stream(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); + osmo_xlm_sap_down(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); + ss7_asp_disconnect_stream(asp); break; case SS7_ASP_LM_T_WAIT_RK_REG_RESP: /* timeout of registration of routing key */ - ss7_asp_disconnect_stream(lmp->asp); + ss7_asp_disconnect_stream(asp); break; } return 0; @@ -238,7 +233,7 @@ static void lm_wait_notify(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct lm_fsm_priv *lmp = fi->priv; + struct osmo_ss7_asp *asp = fi->priv; struct osmo_xlm_prim *oxp = data; switch (event) { @@ -251,12 +246,12 @@ break; /* Don't change active ASP if there's already one active. */ - if (ss7_asp_determine_traf_mode(lmp->asp) == OSMO_SS7_AS_TMOD_OVERRIDE && + if (ss7_asp_determine_traf_mode(asp) == OSMO_SS7_AS_TMOD_OVERRIDE && oxp->u.notify.status_info == M3UA_NOTIFY_I_AS_ACT) break; lm_fsm_state_chg(fi, S_ACTIVE); - osmo_fsm_inst_dispatch(lmp->asp->fi, XUA_ASP_E_M_ASP_ACTIVE_REQ, NULL); + osmo_fsm_inst_dispatch(asp->fi, XUA_ASP_E_M_ASP_ACTIVE_REQ, NULL); break; case LM_E_AS_INACTIVE_IND: /* we now know that an AS is associated with this ASP at @@ -264,14 +259,14 @@ /* request the ASP to go into active state (which * hopefully will bring the AS to active, too) */ lm_fsm_state_chg(fi, S_ACTIVE); - osmo_fsm_inst_dispatch(lmp->asp->fi, XUA_ASP_E_M_ASP_ACTIVE_REQ, NULL); + osmo_fsm_inst_dispatch(asp->fi, XUA_ASP_E_M_ASP_ACTIVE_REQ, NULL); break; } }; static void lm_rkm_reg(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct lm_fsm_priv *lmp = fi->priv; + struct osmo_ss7_asp *asp = fi->priv; struct osmo_xlm_prim *oxp; int rc; @@ -280,16 +275,16 @@ oxp = data; if (oxp->u.rk_reg.status != M3UA_RKM_REG_SUCCESS) { LOGPFSML(fi, LOGL_NOTICE, "Received RKM_REG_RSP with negative result\n"); - ss7_asp_disconnect_stream(lmp->asp); + ss7_asp_disconnect_stream(asp); } else { unsigned long timeout_sec; rc = handle_reg_conf(fi, oxp->u.rk_reg.key.l_rk_id, oxp->u.rk_reg.key.context); if (rc < 0) - ss7_asp_disconnect_stream(lmp->asp); + ss7_asp_disconnect_stream(asp); /* RKM registration was successful, we can transition to WAIT_NOTIFY * state and assume that an NOTIFY/AS-INACTIVE arrives within * T_WAIT_NOTIFY_RKM seconds */ - timeout_sec = osmo_tdef_get(lmp->asp->cfg.T_defs_lm, SS7_ASP_LM_T_WAIT_NOTIY_RKM, OSMO_TDEF_S, -1); + timeout_sec = osmo_tdef_get(asp->cfg.T_defs_lm, SS7_ASP_LM_T_WAIT_NOTIY_RKM, OSMO_TDEF_S, -1); osmo_fsm_inst_state_chg(fi, S_WAIT_NOTIFY, timeout_sec, SS7_ASP_LM_T_WAIT_NOTIY_RKM); } break; @@ -298,13 +293,13 @@ static void lm_active(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct lm_fsm_priv *lmp = fi->priv; + struct osmo_ss7_asp *asp = fi->priv; struct osmo_xlm_prim *oxp; switch (event) { case LM_E_AS_INACTIVE_IND: /* request the ASP to go into active state */ - osmo_fsm_inst_dispatch(lmp->asp->fi, XUA_ASP_E_M_ASP_ACTIVE_REQ, NULL); + osmo_fsm_inst_dispatch(asp->fi, XUA_ASP_E_M_ASP_ACTIVE_REQ, NULL); break; case LM_E_NOTIFY_IND: oxp = data; @@ -396,7 +391,7 @@ 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 osmo_fsm_inst *fi = asp->lm->priv; uint32_t event = osmo_event_for_prim(oph, lm_event_map); char *prim_name = osmo_xlm_prim_name(oph); @@ -412,42 +407,34 @@ 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) { + osmo_fsm_inst_term(lm->priv, OSMO_FSM_TERM_ERROR, NULL); + 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; - 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, lm, asp, LOGL_DEBUG, asp->cfg.name); + if (!fi) { + talloc_free(lm); + return NULL; } - - 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->asp = asp; - fi->priv = lmp; - - 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 = fi; return 0; } -- 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: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ia96ebf40444f46ad718d61befbecb523f267fd6c Gerrit-Change-Number: 42054 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: Move osmo_xua_layer_manager definition to ss7_asp.h
by pespin 05 Feb '26

05 Feb '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42051?usp=email ) Change subject: Move osmo_xua_layer_manager definition to ss7_asp.h ...................................................................... Move osmo_xua_layer_manager definition to ss7_asp.h The struct osmo_xua_layer_manager has no relation to a xua_server, hence move it to ss7_asp.h, where it is used. Change-Id: If7efb8996de0c407f5a466ff959095c8872ddc76 --- M src/ss7_asp.h M src/ss7_xua_srv.h 2 files changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/51/42051/1 diff --git a/src/ss7_asp.h b/src/ss7_asp.h index da4257a..4954d28 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -19,7 +19,10 @@ ***********************************************************************/ struct osmo_ss7_instance; -struct osmo_xua_layer_manager; + +struct osmo_xua_layer_manager { + osmo_prim_cb prim_cb; +}; enum ss7_asp_xua_timer { /* 0 kept unused on purpose since it's handled specially by osmo_fsm */ diff --git a/src/ss7_xua_srv.h b/src/ss7_xua_srv.h index 770d369..1eaf754 100644 --- a/src/ss7_xua_srv.h +++ b/src/ss7_xua_srv.h @@ -15,10 +15,6 @@ struct osmo_ss7_instance; -struct osmo_xua_layer_manager { - osmo_prim_cb prim_cb; -}; - struct osmo_xua_server { struct llist_head list; struct osmo_ss7_instance *inst; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42051?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: If7efb8996de0c407f5a466ff959095c8872ddc76 Gerrit-Change-Number: 42051 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log