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

[S] Change in osmo-hnbgw[master]: Introduce func helper hnbgw_sccp_user_get_sccp_instance()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40268?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Introduce func helper hnbgw_sccp_user_get_sccp_instance() ...................................................................... Introduce func helper hnbgw_sccp_user_get_sccp_instance() This way we keep struct field access within the header file. Change-Id: I1684fa1871098ab6df7c79c9c0e0daf6c6f35b09 --- M include/osmocom/hnbgw/cnlink.h M include/osmocom/hnbgw/hnbgw_sccp.h 2 files changed, 8 insertions(+), 3 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/hnbgw/cnlink.h b/include/osmocom/hnbgw/cnlink.h index c4e494d..fd1b7de 100644 --- a/include/osmocom/hnbgw/cnlink.h +++ b/include/osmocom/hnbgw/cnlink.h @@ -108,9 +108,7 @@ return NULL; if (!cnlink->hnbgw_sccp_user) return NULL; - if (!cnlink->hnbgw_sccp_user->ss7) - return NULL; - return osmo_ss7_get_sccp(cnlink->hnbgw_sccp_user->ss7); + return hnbgw_sccp_user_get_sccp_instance(cnlink->hnbgw_sccp_user); } /* cnlink_fsm.c related: */ diff --git a/include/osmocom/hnbgw/hnbgw_sccp.h b/include/osmocom/hnbgw/hnbgw_sccp.h index d207348..4388a3a 100644 --- a/include/osmocom/hnbgw/hnbgw_sccp.h +++ b/include/osmocom/hnbgw/hnbgw_sccp.h @@ -57,3 +57,10 @@ int hnbgw_sccp_user_tx_data_req(struct hnbgw_sccp_user *hsu, uint32_t scu_conn_id, struct msgb *ranap_msg); int hnbgw_sccp_user_tx_disconnect_req(struct hnbgw_sccp_user *hsu, uint32_t scu_conn_id); + +static inline struct osmo_sccp_instance *hnbgw_sccp_user_get_sccp_instance(const struct hnbgw_sccp_user *hsu) +{ + if (!hsu->ss7) + return NULL; + return osmo_ss7_get_sccp(hsu->ss7); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40268?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1684fa1871098ab6df7c79c9c0e0daf6c6f35b09 Gerrit-Change-Number: 40268 Gerrit-PatchSet: 4 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 month, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: cnlink: Cleanup talloc tree

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40267?usp=email ) Change subject: cnlink: Cleanup talloc tree ...................................................................... cnlink: Cleanup talloc tree Previous logic allocating structs was a big convoluted regarding order of assignments, which then even required a taloc_steal. Since recently the struct hnbgw_cnpool is a talloc context, and struct hnbgw_cnlink are allocated as being part of a cnpool, so clean up the talloc tree by having cnlink under cnpool. Finally, put the cnlink_fsm and the cnlink counters under the hnbgw_cnlink talloc context, where they belong. Change-Id: I90c22f2a2932ede7103c66f2263e72ac2fdae497 --- M src/osmo-hnbgw/cnlink.c 1 file changed, 13 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo-hnbgw/cnlink.c b/src/osmo-hnbgw/cnlink.c index 2ba748c..19f1d3d 100644 --- a/src/osmo-hnbgw/cnlink.c +++ b/src/osmo-hnbgw/cnlink.c @@ -163,12 +163,10 @@ struct hnbgw_cnlink *hnbgw_cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr) { - struct osmo_fsm_inst *fi; struct hnbgw_cnlink *cnlink; const struct rate_ctr_group_desc *ctrg_desc; OSMO_ASSERT(cnpool); - char *name = talloc_asprintf(OTC_SELECT, "%s-%d", cnpool->peer_name, nr); switch (cnpool->domain) { case DOMAIN_CS: @@ -181,28 +179,25 @@ OSMO_ASSERT(0); } - - fi = osmo_fsm_inst_alloc(&cnlink_fsm, g_hnbgw, NULL, LOGL_DEBUG, name); - OSMO_ASSERT(fi); - cnlink = talloc_zero(g_hnbgw, struct hnbgw_cnlink); - fi->priv = cnlink; - + cnlink = talloc_zero(cnpool, struct hnbgw_cnlink); + OSMO_ASSERT(cnlink); *cnlink = (struct hnbgw_cnlink){ - .name = name, .pool = cnpool, - .fi = fi, .nr = nr, .vty = { /* VTY config defaults for the new cnlink */ .nri_ranges = osmo_nri_ranges_alloc(cnlink), }, .allow_attach = true, - .ctrs = rate_ctr_group_alloc(g_hnbgw, ctrg_desc, nr), + .ctrs = rate_ctr_group_alloc(cnlink, ctrg_desc, nr), }; - talloc_steal(cnlink, name); + cnlink->name = talloc_asprintf(cnlink, "%s-%d", cnpool->peer_name, nr); INIT_LLIST_HEAD(&cnlink->map_list); INIT_LLIST_HEAD(&cnlink->paging); + cnlink->fi = osmo_fsm_inst_alloc(&cnlink_fsm, cnlink, cnlink, LOGL_DEBUG, cnlink->name); + OSMO_ASSERT(cnlink->fi); + llist_add_tail(&cnlink->entry, &cnpool->cnlinks); LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "allocated\n"); @@ -229,9 +224,14 @@ { if (!cnlink) return; - osmo_fsm_inst_term(cnlink->fi, OSMO_FSM_TERM_REQUEST, NULL); + if (cnlink->hnbgw_sccp_user) hnbgw_cnlink_drop_sccp(cnlink); + + osmo_fsm_inst_term(cnlink->fi, OSMO_FSM_TERM_REQUEST, NULL); + cnlink->fi = NULL; + rate_ctr_group_free(cnlink->ctrs); + llist_del(&cnlink->entry); talloc_free(cnlink); } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40267?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I90c22f2a2932ede7103c66f2263e72ac2fdae497 Gerrit-Change-Number: 40267 Gerrit-PatchSet: 4 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 month, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: cnlink: Introduce stats group with connected state

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40269?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: cnlink: Introduce stats group with connected state ...................................................................... cnlink: Introduce stats group with connected state Change-Id: I9c78c6b78b4ee8d6836df8d90c5c57103aa4d762 --- M include/osmocom/hnbgw/cnlink.h M src/osmo-hnbgw/cnlink.c M src/osmo-hnbgw/cnlink_fsm.c 3 files changed, 37 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/hnbgw/cnlink.h b/include/osmocom/hnbgw/cnlink.h index fd1b7de..ee1a8dd 100644 --- a/include/osmocom/hnbgw/cnlink.h +++ b/include/osmocom/hnbgw/cnlink.h @@ -3,6 +3,7 @@ #include <stdbool.h> #include <osmocom/core/rate_ctr.h> +#include <osmocom/core/stat_item.h> #include <osmocom/gsm/gsm48.h> #include <osmocom/sigtran/sccp_sap.h> @@ -48,6 +49,13 @@ CNLINK_CTR_CNPOOL_SUBSCR_ATTACH_LOST, CNLINK_CTR_CNPOOL_EMERG_FORWARDED, }; +#define CNLINK_CTR_INC(cnlink, x) rate_ctr_inc2((cnlink)->ctrs, x) + +enum cnlink_stat { + CNLINK_STAT_CONNECTED, +}; +#define CNLINK_STAT(cnlink, x) osmo_stat_item_group_get_item((cnlink)->statg, x) +#define CNLINK_STAT_SET(cnlink, x, val) osmo_stat_item_set(CNLINK_STAT(cnlink, x), val) /* User provided configuration for struct hnbgw_cnlink. */ struct hnbgw_cnlink_cfg { @@ -90,6 +98,7 @@ struct llist_head paging; struct rate_ctr_group *ctrs; + struct osmo_stat_item_group *statg; }; struct hnbgw_cnlink *hnbgw_cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr); @@ -125,5 +134,3 @@ #define LOG_CNLINK(CNLINK, SUBSYS, LEVEL, FMT, ARGS...) \ LOGP(SUBSYS, LEVEL, "(%s) " FMT, (CNLINK) ? (CNLINK)->name : "null", ##ARGS) - -#define CNLINK_CTR_INC(cnlink, x) rate_ctr_inc2((cnlink)->ctrs, x) diff --git a/src/osmo-hnbgw/cnlink.c b/src/osmo-hnbgw/cnlink.c index 19f1d3d..8d312c6 100644 --- a/src/osmo-hnbgw/cnlink.c +++ b/src/osmo-hnbgw/cnlink.c @@ -21,6 +21,7 @@ #include <osmocom/core/fsm.h> #include <osmocom/core/tdef.h> #include <osmocom/core/stats.h> +#include <osmocom/core/stat_item.h> #include <osmocom/gsm/gsm23236.h> @@ -161,19 +162,42 @@ cnlink_ctr_description, }; +static const struct osmo_stat_item_desc cnlink_stat_desc[] = { + [CNLINK_STAT_CONNECTED] = { "connected", "Connected (1) or disconnected (0)", NULL, 60, 0 }, +}; + +const struct osmo_stat_item_group_desc msc_statg_desc = { + .group_name_prefix = "msc", + .group_description = "MSC", + .class_id = OSMO_STATS_CLASS_GLOBAL, + .num_items = ARRAY_SIZE(cnlink_stat_desc), + .item_desc = cnlink_stat_desc, +}; + +const struct osmo_stat_item_group_desc sgsn_statg_desc = { + .group_name_prefix = "sgsn", + .group_description = "SGSN", + .class_id = OSMO_STATS_CLASS_GLOBAL, + .num_items = ARRAY_SIZE(cnlink_stat_desc), + .item_desc = cnlink_stat_desc, +}; + struct hnbgw_cnlink *hnbgw_cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr) { struct hnbgw_cnlink *cnlink; const struct rate_ctr_group_desc *ctrg_desc; + const struct osmo_stat_item_group_desc *statg_desc; OSMO_ASSERT(cnpool); switch (cnpool->domain) { case DOMAIN_CS: ctrg_desc = &msc_ctrg_desc; + statg_desc = &msc_statg_desc; break; case DOMAIN_PS: ctrg_desc = &sgsn_ctrg_desc; + statg_desc = &sgsn_statg_desc; break; default: OSMO_ASSERT(0); @@ -190,6 +214,7 @@ }, .allow_attach = true, .ctrs = rate_ctr_group_alloc(cnlink, ctrg_desc, nr), + .statg = osmo_stat_item_group_alloc(cnlink, statg_desc, nr), }; cnlink->name = talloc_asprintf(cnlink, "%s-%d", cnpool->peer_name, nr); INIT_LLIST_HEAD(&cnlink->map_list); @@ -230,6 +255,7 @@ osmo_fsm_inst_term(cnlink->fi, OSMO_FSM_TERM_REQUEST, NULL); cnlink->fi = NULL; + osmo_stat_item_group_free(cnlink->statg); rate_ctr_group_free(cnlink->ctrs); llist_del(&cnlink->entry); talloc_free(cnlink); diff --git a/src/osmo-hnbgw/cnlink_fsm.c b/src/osmo-hnbgw/cnlink_fsm.c index acfbae4..9402198 100644 --- a/src/osmo-hnbgw/cnlink_fsm.c +++ b/src/osmo-hnbgw/cnlink_fsm.c @@ -63,6 +63,7 @@ static void link_up(struct hnbgw_cnlink *cnlink) { LOGPFSML(cnlink->fi, LOGL_NOTICE, "link up\n"); + CNLINK_STAT_SET(cnlink, CNLINK_STAT_CONNECTED, 1); } static void link_lost(struct hnbgw_cnlink *cnlink) @@ -70,6 +71,7 @@ struct hnbgw_context_map *map, *map2; LOGPFSML(cnlink->fi, LOGL_NOTICE, "link lost\n"); + CNLINK_STAT_SET(cnlink, CNLINK_STAT_CONNECTED, 0); llist_for_each_entry_safe(map, map2, &cnlink->map_list, hnbgw_cnlink_entry) context_map_cnlink_lost(map); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40269?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I9c78c6b78b4ee8d6836df8d90c5c57103aa4d762 Gerrit-Change-Number: 40269 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 month, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: cnlink: Cleanup talloc tree

by pespin

Attention is currently required from: laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40267?usp=email ) Change subject: cnlink: Cleanup talloc tree ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40267?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I90c22f2a2932ede7103c66f2263e72ac2fdae497 Gerrit-Change-Number: 40267 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 12 May 2025 11:42:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: cnlink: Cleanup talloc tree

by pespin

Attention is currently required from: laforge, osmith, pespin. Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40267?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by osmith Change subject: cnlink: Cleanup talloc tree ...................................................................... cnlink: Cleanup talloc tree Previous logic allocating structs was a big convoluted regarding order of assignments, which then even required a taloc_steal. Since recently the struct hnbgw_cnpool is a talloc context, and struct hnbgw_cnlink are allocated as being part of a cnpool, so clean up the talloc tree by having cnlink under cnpool. Finally, put the cnlink_fsm and the cnlink counters under the hnbgw_cnlink talloc context, where they belong. Change-Id: I90c22f2a2932ede7103c66f2263e72ac2fdae497 --- M src/osmo-hnbgw/cnlink.c 1 file changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/67/40267/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40267?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I90c22f2a2932ede7103c66f2263e72ac2fdae497 Gerrit-Change-Number: 40267 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: context_map: Rename ps_rab(_ass) to denote it is a list

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40273?usp=email ) Change subject: context_map: Rename ps_rab(_ass) to denote it is a list ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40273?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I6ac029e6a820a031a443dae8c83e44f6ae9fb5fa Gerrit-Change-Number: 40273 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 11:41:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: cnlink: Introduce stats group with connected state

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40269?usp=email ) Change subject: cnlink: Introduce stats group with connected state ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40269?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I9c78c6b78b4ee8d6836df8d90c5c57103aa4d762 Gerrit-Change-Number: 40269 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 11:41:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[L] Change in osmo-hnbgw[master]: Get rid of cnpool->cnlink_ctrg_desc

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40265?usp=email ) Change subject: Get rid of cnpool->cnlink_ctrg_desc ...................................................................... Get rid of cnpool->cnlink_ctrg_desc There's no need to store that pointer in the cnpool, since the domain can be obtained from cnpool at cnlink creation time. Move the per-cnlink rate counters to the file where they belong. Change-Id: Iaa36bb52f8135ef2421931f1ea6a40885b588e1d --- M include/osmocom/hnbgw/hnbgw_cn.h M src/osmo-hnbgw/cnlink.c M src/osmo-hnbgw/hnbgw_cn.c 3 files changed, 142 insertions(+), 132 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/osmocom/hnbgw/hnbgw_cn.h b/include/osmocom/hnbgw/hnbgw_cn.h index fe4f7bb..1a5288a 100644 --- a/include/osmocom/hnbgw/hnbgw_cn.h +++ b/include/osmocom/hnbgw/hnbgw_cn.h @@ -49,9 +49,6 @@ * behavior, emergency calls need a separate round-robin counter. */ unsigned int round_robin_next_emerg_nr; - /* rate counter group that child hnbgw_cnlinks should use (points to msc_ctrg_desc or sgsn_ctrg_desc) */ - const struct rate_ctr_group_desc *cnlink_ctrg_desc; - /* Running counters for this pool */ struct rate_ctr_group *ctrs; }; diff --git a/src/osmo-hnbgw/cnlink.c b/src/osmo-hnbgw/cnlink.c index ae6b266..d02d45b 100644 --- a/src/osmo-hnbgw/cnlink.c +++ b/src/osmo-hnbgw/cnlink.c @@ -20,6 +20,7 @@ #include <osmocom/core/fsm.h> #include <osmocom/core/tdef.h> +#include <osmocom/core/stats.h> #include <osmocom/gsm/gsm23236.h> @@ -34,13 +35,153 @@ #include <osmocom/hnbgw/tdefs.h> #include <osmocom/hnbgw/context_map.h> +static const struct rate_ctr_desc cnlink_ctr_description[] = { + [CNLINK_CTR_RANAP_RX_UDT_RESET] = { + "ranap:rx:udt:reset", + "RANAP Unitdata RESET messages received" + }, + [CNLINK_CTR_RANAP_RX_UDT_RESET_ACK] = { + "ranap:rx:udt:reset_ack", + "RANAP Unitdata RESET ACK messages received", + }, + [CNLINK_CTR_RANAP_RX_UDT_PAGING] = { + "ranap:rx:udt:paging", + "RANAP Unitdata PAGING messages received", + }, + [CNLINK_CTR_RANAP_RX_UDT_UNKNOWN] = { + "ranap:rx:udt:unknown", + "Unknown RANAP Unitdata messages received", + }, + [CNLINK_CTR_RANAP_RX_UDT_UNSUPPORTED] = { + "ranap:rx:udt:unsupported", + "Unsupported RANAP Unitdata messages received", + }, + [CNLINK_CTR_RANAP_RX_UDT_OVERLOAD_IND] = { + "ranap:rx:udt:overload_ind", + "RANAP Unitdata Overload Indications received", + }, + [CNLINK_CTR_RANAP_RX_UDT_ERROR_IND] = { + "ranap:rx:udt:error_ind", + "RANAP Unitdata Error Indications received", + }, + + [CNLINK_CTR_RANAP_TX_UDT_RESET] = { + "ranap:tx:udt:reset", + "RANAP Unitdata RESET messages transmitted", + }, + [CNLINK_CTR_RANAP_TX_UDT_RESET_ACK] = { + "ranap:tx:udt:reset_ack", + "RANAP Unitdata RESET ACK messages transmitted", + }, + + /* SCCP Counters: */ + [CNLINK_CTR_SCCP_N_UNITDATA_REQ] = { + "sccp:n_unit_data:req", + "Submit SCCP N-UNITDATA.req (UL)" + }, + [CNLINK_CTR_SCCP_N_UNITDATA_IND] = { + "sccp:n_unit_data:ind", + "Received SCCP N-UNITDATA.ind (DL)" + }, + [CNLINK_CTR_SCCP_N_CONNECT_REQ] = { + "sccp:n_connect:req", + "Submit SCCP N-CONNECT.req (UL SCCP CR)" + }, + [CNLINK_CTR_SCCP_N_CONNECT_CNF] = { + "sccp:n_connect:cnf", + "Received SCCP N-CONNECT.cnf (DL SCCP CC)" + }, + [CNLINK_CTR_SCCP_N_DATA_REQ] = { + "sccp:n_data:req", + "SUBMIT SCCP N-DATA.req (UL)" + }, + [CNLINK_CTR_SCCP_N_DATA_IND] = { + "sccp:n_data:ind", + "Received SCCP N-DATA.ind (DL)" + }, + [CNLINK_CTR_SCCP_N_DISCONNECT_REQ] = { + "sccp:n_disconnect:req", + "Submit SCCP N-DISCONNECT.req (UL SCCP RLC)" + }, + [CNLINK_CTR_SCCP_N_DISCONNECT_IND] = { + "sccp:n_disconnect:ind", + "Received SCCP N-DISCONNECT.ind (DL SCCP RLSD)" + }, + [CNLINK_CTR_SCCP_N_PCSTATE_IND] = { + "sccp:n_pcstate:ind", + "Received SCCP N-PCSTATE.ind" + }, + [CNLINK_CTR_SCCP_RLSD_CN_ORIGIN] = { + "sccp:rlsd_cn_origin", + "Received unexpected SCCP RSLD originated unilaterally by CN" + }, + + /* Indicators for CN pool usage */ + [CNLINK_CTR_CNPOOL_SUBSCR_NEW] = { + "cnpool:subscr:new", + "Complete Layer 3 requests assigned to this CN link by round-robin (no NRI was assigned yet).", + }, + [CNLINK_CTR_CNPOOL_SUBSCR_REATTACH] = { + "cnpool:subscr:reattach", + "Complete Layer 3 requests assigned to this CN link by round-robin because the subscriber indicates a" + " NULL-NRI (previously assigned by another CN link).", + }, + [CNLINK_CTR_CNPOOL_SUBSCR_KNOWN] = { + "cnpool:subscr:known", + "Complete Layer 3 requests directed to this CN link because the subscriber indicates an NRI of this CN link.", + }, + [CNLINK_CTR_CNPOOL_SUBSCR_PAGED] = { + "cnpool:subscr:paged", + "Paging Response directed to this CN link because the subscriber was recently paged by this CN link.", + }, + [CNLINK_CTR_CNPOOL_SUBSCR_ATTACH_LOST] = { + "cnpool:subscr:attach_lost", + "A subscriber indicates an NRI value matching this CN link, but the CN link is not connected:" + " a re-attach to another CN link (if available) was forced, with possible service failure.", + }, + [CNLINK_CTR_CNPOOL_EMERG_FORWARDED] = { + "cnpool:emerg:forwarded", + "Emergency call requests forwarded to this CN link.", + }, +}; + +static const struct rate_ctr_group_desc msc_ctrg_desc = { + "msc", + "MSC", + OSMO_STATS_CLASS_GLOBAL, + ARRAY_SIZE(cnlink_ctr_description), + cnlink_ctr_description, +}; + +static const struct rate_ctr_group_desc sgsn_ctrg_desc = { + "sgsn", + "SGSN", + OSMO_STATS_CLASS_GLOBAL, + ARRAY_SIZE(cnlink_ctr_description), + cnlink_ctr_description, +}; + struct hnbgw_cnlink *hnbgw_cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr) { struct osmo_fsm_inst *fi; struct hnbgw_cnlink *cnlink; + const struct rate_ctr_group_desc *ctrg_desc; + OSMO_ASSERT(cnpool); char *name = talloc_asprintf(OTC_SELECT, "%s-%d", cnpool->peer_name, nr); + switch (cnpool->domain) { + case DOMAIN_CS: + ctrg_desc = &msc_ctrg_desc; + break; + case DOMAIN_PS: + ctrg_desc = &sgsn_ctrg_desc; + break; + default: + OSMO_ASSERT(0); + } + + fi = osmo_fsm_inst_alloc(&cnlink_fsm, g_hnbgw, NULL, LOGL_DEBUG, name); OSMO_ASSERT(fi); cnlink = talloc_zero(g_hnbgw, struct hnbgw_cnlink); @@ -56,7 +197,7 @@ .nri_ranges = osmo_nri_ranges_alloc(cnlink), }, .allow_attach = true, - .ctrs = rate_ctr_group_alloc(g_hnbgw, cnpool->cnlink_ctrg_desc, nr), + .ctrs = rate_ctr_group_alloc(g_hnbgw, ctrg_desc, nr), }; talloc_steal(cnlink, name); INIT_LLIST_HEAD(&cnlink->map_list); diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 4420157..f90b945 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -418,132 +418,6 @@ return osmo_sccp_inst_addr_to_str_c(OTC_SELECT, sccp, addr); } -static const struct rate_ctr_desc cnlink_ctr_description[] = { - [CNLINK_CTR_RANAP_RX_UDT_RESET] = { - "ranap:rx:udt:reset", - "RANAP Unitdata RESET messages received" - }, - [CNLINK_CTR_RANAP_RX_UDT_RESET_ACK] = { - "ranap:rx:udt:reset_ack", - "RANAP Unitdata RESET ACK messages received", - }, - [CNLINK_CTR_RANAP_RX_UDT_PAGING] = { - "ranap:rx:udt:paging", - "RANAP Unitdata PAGING messages received", - }, - [CNLINK_CTR_RANAP_RX_UDT_UNKNOWN] = { - "ranap:rx:udt:unknown", - "Unknown RANAP Unitdata messages received", - }, - [CNLINK_CTR_RANAP_RX_UDT_UNSUPPORTED] = { - "ranap:rx:udt:unsupported", - "Unsupported RANAP Unitdata messages received", - }, - [CNLINK_CTR_RANAP_RX_UDT_OVERLOAD_IND] = { - "ranap:rx:udt:overload_ind", - "RANAP Unitdata Overload Indications received", - }, - [CNLINK_CTR_RANAP_RX_UDT_ERROR_IND] = { - "ranap:rx:udt:error_ind", - "RANAP Unitdata Error Indications received", - }, - - [CNLINK_CTR_RANAP_TX_UDT_RESET] = { - "ranap:tx:udt:reset", - "RANAP Unitdata RESET messages transmitted", - }, - [CNLINK_CTR_RANAP_TX_UDT_RESET_ACK] = { - "ranap:tx:udt:reset_ack", - "RANAP Unitdata RESET ACK messages transmitted", - }, - - /* SCCP Counters: */ - [CNLINK_CTR_SCCP_N_UNITDATA_REQ] = { - "sccp:n_unit_data:req", - "Submit SCCP N-UNITDATA.req (UL)" - }, - [CNLINK_CTR_SCCP_N_UNITDATA_IND] = { - "sccp:n_unit_data:ind", - "Received SCCP N-UNITDATA.ind (DL)" - }, - [CNLINK_CTR_SCCP_N_CONNECT_REQ] = { - "sccp:n_connect:req", - "Submit SCCP N-CONNECT.req (UL SCCP CR)" - }, - [CNLINK_CTR_SCCP_N_CONNECT_CNF] = { - "sccp:n_connect:cnf", - "Received SCCP N-CONNECT.cnf (DL SCCP CC)" - }, - [CNLINK_CTR_SCCP_N_DATA_REQ] = { - "sccp:n_data:req", - "SUBMIT SCCP N-DATA.req (UL)" - }, - [CNLINK_CTR_SCCP_N_DATA_IND] = { - "sccp:n_data:ind", - "Received SCCP N-DATA.ind (DL)" - }, - [CNLINK_CTR_SCCP_N_DISCONNECT_REQ] = { - "sccp:n_disconnect:req", - "Submit SCCP N-DISCONNECT.req (UL SCCP RLC)" - }, - [CNLINK_CTR_SCCP_N_DISCONNECT_IND] = { - "sccp:n_disconnect:ind", - "Received SCCP N-DISCONNECT.ind (DL SCCP RLSD)" - }, - [CNLINK_CTR_SCCP_N_PCSTATE_IND] = { - "sccp:n_pcstate:ind", - "Received SCCP N-PCSTATE.ind" - }, - [CNLINK_CTR_SCCP_RLSD_CN_ORIGIN] = { - "sccp:rlsd_cn_origin", - "Received unexpected SCCP RSLD originated unilaterally by CN" - }, - - /* Indicators for CN pool usage */ - [CNLINK_CTR_CNPOOL_SUBSCR_NEW] = { - "cnpool:subscr:new", - "Complete Layer 3 requests assigned to this CN link by round-robin (no NRI was assigned yet).", - }, - [CNLINK_CTR_CNPOOL_SUBSCR_REATTACH] = { - "cnpool:subscr:reattach", - "Complete Layer 3 requests assigned to this CN link by round-robin because the subscriber indicates a" - " NULL-NRI (previously assigned by another CN link).", - }, - [CNLINK_CTR_CNPOOL_SUBSCR_KNOWN] = { - "cnpool:subscr:known", - "Complete Layer 3 requests directed to this CN link because the subscriber indicates an NRI of this CN link.", - }, - [CNLINK_CTR_CNPOOL_SUBSCR_PAGED] = { - "cnpool:subscr:paged", - "Paging Response directed to this CN link because the subscriber was recently paged by this CN link.", - }, - [CNLINK_CTR_CNPOOL_SUBSCR_ATTACH_LOST] = { - "cnpool:subscr:attach_lost", - "A subscriber indicates an NRI value matching this CN link, but the CN link is not connected:" - " a re-attach to another CN link (if available) was forced, with possible service failure.", - }, - [CNLINK_CTR_CNPOOL_EMERG_FORWARDED] = { - "cnpool:emerg:forwarded", - "Emergency call requests forwarded to this CN link.", - }, -}; - -const struct rate_ctr_group_desc msc_ctrg_desc = { - "msc", - "MSC", - OSMO_STATS_CLASS_GLOBAL, - ARRAY_SIZE(cnlink_ctr_description), - cnlink_ctr_description, -}; - -const struct rate_ctr_group_desc sgsn_ctrg_desc = { - "sgsn", - "SGSN", - OSMO_STATS_CLASS_GLOBAL, - ARRAY_SIZE(cnlink_ctr_description), - cnlink_ctr_description, -}; - static const struct rate_ctr_desc cnpool_ctr_description[] = { [CNPOOL_CTR_SUBSCR_NO_CNLINK] = { "cnpool:subscr:no_cnlink", @@ -606,14 +480,12 @@ cnpool->pool_name = "iucs"; cnpool->peer_name = "msc"; cnpool->default_remote_pc = DEFAULT_PC_MSC; - cnpool->cnlink_ctrg_desc = &msc_ctrg_desc; cnpool->ctrs = rate_ctr_group_alloc(cnpool, &iucs_ctrg_desc, 0); break; case DOMAIN_PS: cnpool->pool_name = "iups"; cnpool->peer_name = "sgsn"; cnpool->default_remote_pc = DEFAULT_PC_SGSN; - cnpool->cnlink_ctrg_desc = &sgsn_ctrg_desc; cnpool->ctrs = rate_ctr_group_alloc(cnpool, &iups_ctrg_desc, 0); break; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40265?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iaa36bb52f8135ef2421931f1ea6a40885b588e1d Gerrit-Change-Number: 40265 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: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[L] Change in osmo-hnbgw[master]: Move cnlink funcs from hnbgw_cn.c to cnlink.c

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40266?usp=email ) Change subject: Move cnlink funcs from hnbgw_cn.c to cnlink.c ...................................................................... Move cnlink funcs from hnbgw_cn.c to cnlink.c This way we finally end up with hnbgw_cnpool related funcionalities in hnbgw_cn.c, and cnlink related ones in cnlink.c. Change-Id: Ic9a962877ea000aa1bca6c2c282baac6e53f6489 --- M include/osmocom/hnbgw/cnlink.h M include/osmocom/hnbgw/hnbgw_cn.h M src/osmo-hnbgw/cnlink.c M src/osmo-hnbgw/hnbgw_cn.c 4 files changed, 172 insertions(+), 171 deletions(-) Approvals: 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 Jenkins Builder: Verified diff --git a/include/osmocom/hnbgw/cnlink.h b/include/osmocom/hnbgw/cnlink.h index 3ede801..c4e494d 100644 --- a/include/osmocom/hnbgw/cnlink.h +++ b/include/osmocom/hnbgw/cnlink.h @@ -98,6 +98,10 @@ int hnbgw_cnlink_tx_ranap_reset(struct hnbgw_cnlink *cnlink); int hnbgw_cnlink_tx_ranap_reset_ack(struct hnbgw_cnlink *cnlink); +int hnbgw_cnlink_start_or_restart(struct hnbgw_cnlink *cnlink); + +char *hnbgw_cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr); + static inline struct osmo_sccp_instance *hnbgw_cnlink_sccp(const struct hnbgw_cnlink *cnlink) { if (!cnlink) diff --git a/include/osmocom/hnbgw/hnbgw_cn.h b/include/osmocom/hnbgw/hnbgw_cn.h index 1a5288a..8e765c8 100644 --- a/include/osmocom/hnbgw/hnbgw_cn.h +++ b/include/osmocom/hnbgw/hnbgw_cn.h @@ -61,6 +61,3 @@ void hnbgw_cnpool_cnlinks_start_or_restart(struct hnbgw_cnpool *cnpool); struct hnbgw_cnlink *cnlink_get_nr(struct hnbgw_cnpool *cnpool, int nr, bool create_if_missing); void hnbgw_cnpool_apply_cfg(struct hnbgw_cnpool *cnpool); - -int hnbgw_cnlink_start_or_restart(struct hnbgw_cnlink *cnlink); -char *hnbgw_cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr); diff --git a/src/osmo-hnbgw/cnlink.c b/src/osmo-hnbgw/cnlink.c index d02d45b..2ba748c 100644 --- a/src/osmo-hnbgw/cnlink.c +++ b/src/osmo-hnbgw/cnlink.c @@ -347,3 +347,171 @@ CNLINK_CTR_INC(cnlink, CNLINK_CTR_RANAP_TX_UDT_RESET_ACK); return hnbgw_cnlink_tx_sccp_unitdata_req(cnlink, msg); } + +static bool addr_has_pc_and_ssn(const struct osmo_sccp_addr *addr) +{ + if (!(addr->presence & OSMO_SCCP_ADDR_T_SSN)) + return false; + if (!(addr->presence & OSMO_SCCP_ADDR_T_PC)) + return false; + return true; +} + +static int resolve_addr_name(struct osmo_sccp_addr *dest, struct osmo_ss7_instance **ss7, + const char *addr_name, const char *label, + uint32_t default_pc) +{ + if (!addr_name) { + osmo_sccp_make_addr_pc_ssn(dest, default_pc, OSMO_SCCP_SSN_RANAP); + if (label) + LOGP(DCN, LOGL_INFO, "%s remote addr not configured, using default: %s\n", label, + osmo_sccp_addr_name(*ss7, dest)); + return 0; + } + + *ss7 = osmo_sccp_addr_by_name(dest, addr_name); + if (!*ss7) { + if (label) + LOGP(DCN, LOGL_ERROR, "%s remote addr: no such SCCP address book entry: '%s'\n", + label, addr_name); + return -1; + } + + osmo_sccp_addr_set_ssn(dest, OSMO_SCCP_SSN_RANAP); + + if (!addr_has_pc_and_ssn(dest)) { + if (label) + LOGP(DCN, LOGL_ERROR, "Invalid/incomplete %s remote-addr: %s\n", + label, osmo_sccp_addr_name(*ss7, dest)); + return -1; + } + + return 0; +} + +char *hnbgw_cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr) +{ + struct osmo_sccp_instance *sccp = hnbgw_cnlink_sccp(cnlink); + if (!sccp) + return osmo_sccp_addr_dump(addr); + return osmo_sccp_inst_addr_to_str_c(OTC_SELECT, sccp, addr); +} + +static void hnbgw_cnlink_cfg_copy(struct hnbgw_cnlink *cnlink) +{ + struct osmo_nri_range *r; + + osmo_talloc_replace_string(cnlink, &cnlink->use.remote_addr_name, cnlink->vty.remote_addr_name); + + osmo_nri_ranges_free(cnlink->use.nri_ranges); + cnlink->use.nri_ranges = osmo_nri_ranges_alloc(cnlink); + llist_for_each_entry(r, &cnlink->vty.nri_ranges->entries, entry) + osmo_nri_ranges_add(cnlink->use.nri_ranges, r); +} + +static bool hnbgw_cnlink_sccp_cfg_changed(struct hnbgw_cnlink *cnlink) +{ + bool changed = false; + + if (cnlink->vty.remote_addr_name && cnlink->use.remote_addr_name) { + struct osmo_ss7_instance *ss7; + struct osmo_sccp_addr remote_addr = {}; + + /* Instead of comparing whether the address book entry names are different, actually resolve the + * resulting SCCP address, and only restart the cnlink if the resulting address changed. */ + resolve_addr_name(&remote_addr, &ss7, cnlink->vty.remote_addr_name, NULL, DEFAULT_PC_HNBGW); + if (osmo_sccp_addr_cmp(&remote_addr, &cnlink->remote_addr, OSMO_SCCP_ADDR_T_PC | OSMO_SCCP_ADDR_T_SSN)) + changed = true; + } else if (cnlink->vty.remote_addr_name != cnlink->use.remote_addr_name) { + /* One of them is NULL, the other is not. */ + changed = true; + } + + /* if more cnlink configuration is added in the future, it needs to be compared here. */ + + return changed; +} + +static void hnbgw_cnlink_log_self(struct hnbgw_cnlink *cnlink) +{ + struct osmo_ss7_instance *ss7 = cnlink->hnbgw_sccp_user->ss7; + LOG_CNLINK(cnlink, DCN, LOGL_NOTICE, "using: cs7-%u %s <-> %s %s %s\n", + osmo_ss7_instance_get_id(ss7), + /* printing the entire SCCP address is quite long, rather just print the point-code */ + osmo_ss7_pointcode_print(ss7, cnlink->hnbgw_sccp_user->local_addr.pc), + osmo_ss7_pointcode_print2(ss7, cnlink->remote_addr.pc), + cnlink->name, cnlink->use.remote_addr_name ? : "(default remote point-code)"); +} + +/* If not present yet, set up all of osmo_ss7_instance, osmo_sccp_instance and hnbgw_sccp_user for the given cnlink. + * The cs7 instance nr to use is determined by cnlink->remote_addr_name, or cs7 instance 0 if that is not present. + * Set cnlink->hnbgw_sccp_user to the new SCCP instance. Return 0 on success, negative on error. */ +int hnbgw_cnlink_start_or_restart(struct hnbgw_cnlink *cnlink) +{ + struct osmo_ss7_instance *ss7 = NULL; + struct hnbgw_sccp_user *hsu; + + /* If a hnbgw_sccp_user has already been set up, use that. */ + if (cnlink->hnbgw_sccp_user) { + if (hnbgw_cnlink_sccp_cfg_changed(cnlink)) { + LOG_CNLINK(cnlink, DCN, LOGL_NOTICE, "config changed, restarting SCCP\n"); + hnbgw_cnlink_drop_sccp(cnlink); + } else { + LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "SCCP instance already set up, using %s\n", + cnlink->hnbgw_sccp_user->name); + return 0; + } + } else { + LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "no SCCP instance selected yet\n"); + } + + /* Copy the current configuration: cnlink->use = cnlink->vty */ + hnbgw_cnlink_cfg_copy(cnlink); + + /* Figure out which cs7 instance to use. If cnlink->remote_addr_name is set, it points to an address book entry + * in a specific cs7 instance. If it is not set, leave ss7 == NULL to use cs7 instance 0. */ + if (cnlink->use.remote_addr_name) { + if (resolve_addr_name(&cnlink->remote_addr, &ss7, cnlink->use.remote_addr_name, cnlink->name, + DEFAULT_PC_HNBGW)) { + LOG_CNLINK(cnlink, DCN, LOGL_ERROR, "cannot initialize SCCP: there is no SCCP address named '%s'\n", + cnlink->use.remote_addr_name); + return -ENOENT; + } + + LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "remote-addr is '%s', using cs7 instance %u\n", + cnlink->use.remote_addr_name, osmo_ss7_instance_get_id(ss7)); + } else { + /* If no address is configured, use the default remote CN address, according to legacy behavior. */ + osmo_sccp_make_addr_pc_ssn(&cnlink->remote_addr, cnlink->pool->default_remote_pc, OSMO_SCCP_SSN_RANAP); + } + + /* If no 'cs7 instance' has been selected by the address, see if there already is a cs7 0 we can use by default. + * If it doesn't exist, it will get created by osmo_sccp_simple_client_on_ss7_id(). */ + if (!ss7) { + ss7 = osmo_ss7_instance_find(0); + LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "Using default 'cs7 instance 0' (%s)\n", ss7 ? "already exists" : "will create"); + } + + if (ss7) { + /* Has another cnlink already set up an SCCP instance for this ss7? */ + llist_for_each_entry(hsu, &g_hnbgw->sccp.users, entry) { + if (hsu->ss7 != ss7) + continue; + LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "using existing SCCP instance %s on cs7 instance %u\n", + hsu->name, osmo_ss7_instance_get_id(ss7)); + cnlink->hnbgw_sccp_user = hsu; + hnbgw_sccp_user_get(cnlink->hnbgw_sccp_user, HSU_USE_CNLINK); + hnbgw_cnlink_log_self(cnlink); + return 0; + } + /* else cnlink->hnbgw_sccp_user stays NULL and is set up below. */ + LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "cs7 instance %u has no configured SCCP instance yet\n", osmo_ss7_instance_get_id(ss7)); + } + + /* No SCCP instance yet for this ss7. Create it. If no address name is given that resolves to a + * particular cs7 instance above, use 'cs7 instance 0'. */ + cnlink->hnbgw_sccp_user = hnbgw_sccp_user_alloc(ss7 ? osmo_ss7_instance_get_id(ss7) : 0); + hnbgw_sccp_user_get(cnlink->hnbgw_sccp_user, HSU_USE_CNLINK); + hnbgw_cnlink_log_self(cnlink); + return 0; +} diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index f90b945..f881dc1 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -42,47 +42,6 @@ #include <osmocom/hnbgw/hnbgw_cn.h> #include <osmocom/hnbgw/context_map.h> -static bool addr_has_pc_and_ssn(const struct osmo_sccp_addr *addr) -{ - if (!(addr->presence & OSMO_SCCP_ADDR_T_SSN)) - return false; - if (!(addr->presence & OSMO_SCCP_ADDR_T_PC)) - return false; - return true; -} - -static int resolve_addr_name(struct osmo_sccp_addr *dest, struct osmo_ss7_instance **ss7, - const char *addr_name, const char *label, - uint32_t default_pc) -{ - if (!addr_name) { - osmo_sccp_make_addr_pc_ssn(dest, default_pc, OSMO_SCCP_SSN_RANAP); - if (label) - LOGP(DCN, LOGL_INFO, "%s remote addr not configured, using default: %s\n", label, - osmo_sccp_addr_name(*ss7, dest)); - return 0; - } - - *ss7 = osmo_sccp_addr_by_name(dest, addr_name); - if (!*ss7) { - if (label) - LOGP(DCN, LOGL_ERROR, "%s remote addr: no such SCCP address book entry: '%s'\n", - label, addr_name); - return -1; - } - - osmo_sccp_addr_set_ssn(dest, OSMO_SCCP_SSN_RANAP); - - if (!addr_has_pc_and_ssn(dest)) { - if (label) - LOGP(DCN, LOGL_ERROR, "Invalid/incomplete %s remote-addr: %s\n", - label, osmo_sccp_addr_name(*ss7, dest)); - return -1; - } - - return 0; -} - void hnbgw_cnpool_apply_cfg(struct hnbgw_cnpool *cnpool) { struct osmo_nri_range *r; @@ -95,125 +54,6 @@ osmo_nri_ranges_add(cnpool->use.null_nri_ranges, r); } -static void hnbgw_cnlink_cfg_copy(struct hnbgw_cnlink *cnlink) -{ - struct osmo_nri_range *r; - - osmo_talloc_replace_string(cnlink, &cnlink->use.remote_addr_name, cnlink->vty.remote_addr_name); - - osmo_nri_ranges_free(cnlink->use.nri_ranges); - cnlink->use.nri_ranges = osmo_nri_ranges_alloc(cnlink); - llist_for_each_entry(r, &cnlink->vty.nri_ranges->entries, entry) - osmo_nri_ranges_add(cnlink->use.nri_ranges, r); -} - -static bool hnbgw_cnlink_sccp_cfg_changed(struct hnbgw_cnlink *cnlink) -{ - bool changed = false; - - if (cnlink->vty.remote_addr_name && cnlink->use.remote_addr_name) { - struct osmo_ss7_instance *ss7; - struct osmo_sccp_addr remote_addr = {}; - - /* Instead of comparing whether the address book entry names are different, actually resolve the - * resulting SCCP address, and only restart the cnlink if the resulting address changed. */ - resolve_addr_name(&remote_addr, &ss7, cnlink->vty.remote_addr_name, NULL, DEFAULT_PC_HNBGW); - if (osmo_sccp_addr_cmp(&remote_addr, &cnlink->remote_addr, OSMO_SCCP_ADDR_T_PC | OSMO_SCCP_ADDR_T_SSN)) - changed = true; - } else if (cnlink->vty.remote_addr_name != cnlink->use.remote_addr_name) { - /* One of them is NULL, the other is not. */ - changed = true; - } - - /* if more cnlink configuration is added in the future, it needs to be compared here. */ - - return changed; -} - -static void hnbgw_cnlink_log_self(struct hnbgw_cnlink *cnlink) -{ - struct osmo_ss7_instance *ss7 = cnlink->hnbgw_sccp_user->ss7; - LOG_CNLINK(cnlink, DCN, LOGL_NOTICE, "using: cs7-%u %s <-> %s %s %s\n", - osmo_ss7_instance_get_id(ss7), - /* printing the entire SCCP address is quite long, rather just print the point-code */ - osmo_ss7_pointcode_print(ss7, cnlink->hnbgw_sccp_user->local_addr.pc), - osmo_ss7_pointcode_print2(ss7, cnlink->remote_addr.pc), - cnlink->name, cnlink->use.remote_addr_name ? : "(default remote point-code)"); -} - -/* If not present yet, set up all of osmo_ss7_instance, osmo_sccp_instance and hnbgw_sccp_user for the given cnlink. - * The cs7 instance nr to use is determined by cnlink->remote_addr_name, or cs7 instance 0 if that is not present. - * Set cnlink->hnbgw_sccp_user to the new SCCP instance. Return 0 on success, negative on error. */ -int hnbgw_cnlink_start_or_restart(struct hnbgw_cnlink *cnlink) -{ - struct osmo_ss7_instance *ss7 = NULL; - struct hnbgw_sccp_user *hsu; - - /* If a hnbgw_sccp_user has already been set up, use that. */ - if (cnlink->hnbgw_sccp_user) { - if (hnbgw_cnlink_sccp_cfg_changed(cnlink)) { - LOG_CNLINK(cnlink, DCN, LOGL_NOTICE, "config changed, restarting SCCP\n"); - hnbgw_cnlink_drop_sccp(cnlink); - } else { - LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "SCCP instance already set up, using %s\n", - cnlink->hnbgw_sccp_user->name); - return 0; - } - } else { - LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "no SCCP instance selected yet\n"); - } - - /* Copy the current configuration: cnlink->use = cnlink->vty */ - hnbgw_cnlink_cfg_copy(cnlink); - - /* Figure out which cs7 instance to use. If cnlink->remote_addr_name is set, it points to an address book entry - * in a specific cs7 instance. If it is not set, leave ss7 == NULL to use cs7 instance 0. */ - if (cnlink->use.remote_addr_name) { - if (resolve_addr_name(&cnlink->remote_addr, &ss7, cnlink->use.remote_addr_name, cnlink->name, - DEFAULT_PC_HNBGW)) { - LOG_CNLINK(cnlink, DCN, LOGL_ERROR, "cannot initialize SCCP: there is no SCCP address named '%s'\n", - cnlink->use.remote_addr_name); - return -ENOENT; - } - - LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "remote-addr is '%s', using cs7 instance %u\n", - cnlink->use.remote_addr_name, osmo_ss7_instance_get_id(ss7)); - } else { - /* If no address is configured, use the default remote CN address, according to legacy behavior. */ - osmo_sccp_make_addr_pc_ssn(&cnlink->remote_addr, cnlink->pool->default_remote_pc, OSMO_SCCP_SSN_RANAP); - } - - /* If no 'cs7 instance' has been selected by the address, see if there already is a cs7 0 we can use by default. - * If it doesn't exist, it will get created by osmo_sccp_simple_client_on_ss7_id(). */ - if (!ss7) { - ss7 = osmo_ss7_instance_find(0); - LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "Using default 'cs7 instance 0' (%s)\n", ss7 ? "already exists" : "will create"); - } - - if (ss7) { - /* Has another cnlink already set up an SCCP instance for this ss7? */ - llist_for_each_entry(hsu, &g_hnbgw->sccp.users, entry) { - if (hsu->ss7 != ss7) - continue; - LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "using existing SCCP instance %s on cs7 instance %u\n", - hsu->name, osmo_ss7_instance_get_id(ss7)); - cnlink->hnbgw_sccp_user = hsu; - hnbgw_sccp_user_get(cnlink->hnbgw_sccp_user, HSU_USE_CNLINK); - hnbgw_cnlink_log_self(cnlink); - return 0; - } - /* else cnlink->hnbgw_sccp_user stays NULL and is set up below. */ - LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "cs7 instance %u has no configured SCCP instance yet\n", osmo_ss7_instance_get_id(ss7)); - } - - /* No SCCP instance yet for this ss7. Create it. If no address name is given that resolves to a - * particular cs7 instance above, use 'cs7 instance 0'. */ - cnlink->hnbgw_sccp_user = hnbgw_sccp_user_alloc(ss7 ? osmo_ss7_instance_get_id(ss7) : 0); - hnbgw_sccp_user_get(cnlink->hnbgw_sccp_user, HSU_USE_CNLINK); - hnbgw_cnlink_log_self(cnlink); - return 0; -} - void hnbgw_cnpool_cnlinks_start_or_restart(struct hnbgw_cnpool *cnpool) { struct hnbgw_cnlink *cnlink; @@ -410,14 +250,6 @@ #undef LOG_NRI } -char *hnbgw_cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr) -{ - struct osmo_sccp_instance *sccp = hnbgw_cnlink_sccp(cnlink); - if (!sccp) - return osmo_sccp_addr_dump(addr); - return osmo_sccp_inst_addr_to_str_c(OTC_SELECT, sccp, addr); -} - static const struct rate_ctr_desc cnpool_ctr_description[] = { [CNPOOL_CTR_SUBSCR_NO_CNLINK] = { "cnpool:subscr:no_cnlink", -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40266?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic9a962877ea000aa1bca6c2c282baac6e53f6489 Gerrit-Change-Number: 40266 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 month, 2 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: vty: Allow setting cnlink msc/sgsn name

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40270?usp=email ) Change subject: vty: Allow setting cnlink msc/sgsn name ...................................................................... Patch Set 2: (1 comment) File src/osmo-hnbgw/cnlink.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/40270/comment/d1a6cf02_ec3d013f?u… : PS2, Line 237: osmo_fsm_inst_update_id_f_sanitize(cnlink->fi, '-', cnlink->name); > in theory osmo_fsm_inst_update_id_f_sanitize could fail, more likely than the others below. […] Yeah I thought about that while writing the patch. I guess in this weird case we are fine assuming the logging may be wrong. Otherwise we'd need to somehow revert the new string being applied on other places before the failure, which may create quite a lot of complexity. TBH I personally like this kind of APIs returning an return-code integer even if right now we don't return an error in the implementation. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40270?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic557f20f40fec49ce2c83a73f6e5c8b027d57ef5 Gerrit-Change-Number: 40270 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 12 May 2025 11:36:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 month, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025