March 2024 - gerrit-log - lists.osmocom.org

[M] Change in ...osmo-epdg[master]: Move spawn_wait_ret() to a new misc.erl file

by pespin

Attention is currently required from: fixeria, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36196?usp=email ) Change subject: Move spawn_wait_ret() to a new misc.erl file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36196?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I9777b73942e9dc672dd944a82045710b78893974 Gerrit-Change-Number: 36196 Gerrit-PatchSet: 1 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 08 Mar 2024 12:15:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmo-hnbgw[master]: cosmetic: Rename hnbgw_rx_ranap and friends to *_rx_ranap_udt_ul

by laforge

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36206?usp=email to look at the new patch set (#2). Change subject: cosmetic: Rename hnbgw_rx_ranap and friends to *_rx_ranap_udt_ul ...................................................................... cosmetic: Rename hnbgw_rx_ranap and friends to *_rx_ranap_udt_ul Those functions have always been handling only unit-data in uplink direction, so let's reflect that in the function name to prevent anyone assuming they process connection-oriented RANAP and/or the downlink direction. Change-Id: I29e8176ac19b2e7390e5950b8d0944c8961e491f --- M include/osmocom/hnbgw/hnbgw_ranap.h M src/osmo-hnbgw/hnbgw_ranap.c M src/osmo-hnbgw/hnbgw_rua.c M src/osmo-hnbgw/hnbgw_vty.c 4 files changed, 32 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/06/36206/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36206?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I29e8176ac19b2e7390e5950b8d0944c8961e491f Gerrit-Change-Number: 36206 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: umts_cell_id_name: Use 3-digit MCC and 2/3-digit MNC based on VTY config

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36202?usp=email ) Change subject: umts_cell_id_name: Use 3-digit MCC and 2/3-digit MNC based on VTY config ...................................................................... umts_cell_id_name: Use 3-digit MCC and 2/3-digit MNC based on VTY config Printing the PLMN 001-01 as "1-1" like the existing code is just weird, and also doesn't differentiate between 2-digit and 3-digit MNC in the output. Change-Id: I015ad84a6f61b4420f6bfdaa60e8e1b53a71589c --- M src/osmo-hnbgw/hnbgw.c 1 file changed, 19 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index 33353f2..82ae279 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -193,7 +193,12 @@ const char *umts_cell_id_name(const struct umts_cell_id *ucid) { - return talloc_asprintf(OTC_SELECT, "%u-%u-L%u-R%u-S%u-C%u", ucid->mcc, ucid->mnc, ucid->lac, ucid->rac, + const char *fmtstr = "%03u-%02u-L%u-R%u-S%u-C%u"; + + if (g_hnbgw->config.plmn.mnc_3_digits) + fmtstr = "%03u-%03u-L%u-R%u-S%u-C%u"; + + return talloc_asprintf(OTC_SELECT, fmtstr, ucid->mcc, ucid->mnc, ucid->lac, ucid->rac, ucid->sac, ucid->cid); } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36202?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I015ad84a6f61b4420f6bfdaa60e8e1b53a71589c Gerrit-Change-Number: 36202 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: osmo_hnbgw_main: Install our usual SIGUSR1/SIGUSR2/SIGABRT handlers

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36203?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: osmo_hnbgw_main: Install our usual SIGUSR1/SIGUSR2/SIGABRT handlers ...................................................................... osmo_hnbgw_main: Install our usual SIGUSR1/SIGUSR2/SIGABRT handlers I just wanted to get a talloc report from osmo-hnbgw by sending SIGUSR1 and the process terminated. Clearly not the desired behaviour... Change-Id: I1209a2fadacf62afd5027480426285f527249788 --- M src/osmo-hnbgw/osmo_hnbgw_main.c 1 file changed, 45 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/osmo_hnbgw_main.c b/src/osmo-hnbgw/osmo_hnbgw_main.c index d371914..377ee47 100644 --- a/src/osmo-hnbgw/osmo_hnbgw_main.c +++ b/src/osmo-hnbgw/osmo_hnbgw_main.c @@ -1,6 +1,6 @@ /* OsmoHNBGW main routine */ -/* (C) 2015 by Harald Welte <laforge(a)gnumonks.org> +/* (C) 2015-2024 by Harald Welte <laforge(a)gnumonks.org> * (C) 2016-2023 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> * All Rights Reserved * @@ -19,6 +19,7 @@ * */ +#include <signal.h> #include <getopt.h> #include "config.h" @@ -64,6 +65,32 @@ NULL, }; +static void signal_handler(int signum) +{ + fprintf(stdout, "signal %u received\n", signum); + + switch (signum) { + case SIGABRT: + /* in case of abort, we want to obtain a talloc report and + * then run default SIGABRT handler, who will generate coredump + * and abort the process. abort() should do this for us after we + * return, but program wouldn't exit if an external SIGABRT is + * received. + */ + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(g_hnbgw, stderr); + signal(SIGABRT, SIG_DFL); + raise(SIGABRT); + break; + case SIGUSR1: + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(g_hnbgw, stderr); + break; + default: + break; + } +} + static void print_usage(void) { printf("Usage: osmo-hnbgw\n"); @@ -313,6 +340,11 @@ } } + signal(SIGABRT, &signal_handler); + signal(SIGUSR1, &signal_handler); + signal(SIGUSR2, &signal_handler); + osmo_init_ignore_signals(); + while (1) { rc = osmo_select_main_ctx(0); if (rc < 0) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36203?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1209a2fadacf62afd5027480426285f527249788 Gerrit-Change-Number: 36203 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[L] Change in osmo-hnbgw[master]: [cosmetic] re-order hnbgw.c to group code in major blocks

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36080?usp=email ) Change subject: [cosmetic] re-order hnbgw.c to group code in major blocks ...................................................................... [cosmetic] re-order hnbgw.c to group code in major blocks Change-Id: Ia7ce60e6f80d10b7712de1aa6d8a30dd61690dcc --- M src/osmo-hnbgw/hnbgw.c 1 file changed, 203 insertions(+), 173 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index 086582e..33353f2 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -47,85 +47,10 @@ {} }; -void g_hnbgw_alloc(void *ctx) -{ - OSMO_ASSERT(!g_hnbgw); - g_hnbgw = talloc_zero(ctx, struct hnbgw); - /* strdup so we can easily talloc_free in the VTY code */ - g_hnbgw->config.iuh_local_ip = talloc_strdup(g_hnbgw, HNBGW_LOCAL_IP_DEFAULT); - g_hnbgw->config.iuh_local_port = IUH_DEFAULT_SCTP_PORT; - g_hnbgw->config.log_prefix_hnb_id = true; - - /* Set zero PLMN to detect a missing PLMN when transmitting RESET */ - g_hnbgw->config.plmn = (struct osmo_plmn_id){ 0, 0, false }; - - g_hnbgw->next_ue_ctx_id = 23; - INIT_LLIST_HEAD(&g_hnbgw->hnb_list); - INIT_LLIST_HEAD(&g_hnbgw->ue_list); - INIT_LLIST_HEAD(&g_hnbgw->sccp.users); - - g_hnbgw->mgw_pool = mgcp_client_pool_alloc(g_hnbgw); - g_hnbgw->config.mgcp_client = mgcp_client_conf_alloc(g_hnbgw); - -#if ENABLE_PFCP - g_hnbgw->config.pfcp.remote_port = OSMO_PFCP_PORT; -#endif - - g_hnbgw->sccp.cnpool_iucs = (struct hnbgw_cnpool){ - .domain = DOMAIN_CS, - .pool_name = "iucs", - .peer_name = "msc", - .default_remote_pc = DEFAULT_PC_MSC, - .vty = { - .nri_bitlen = OSMO_NRI_BITLEN_DEFAULT, - .null_nri_ranges = osmo_nri_ranges_alloc(g_hnbgw), - }, - .cnlink_ctrg_desc = &msc_ctrg_desc, - - .ctrs = rate_ctr_group_alloc(g_hnbgw, &iucs_ctrg_desc, 0), - }; - INIT_LLIST_HEAD(&g_hnbgw->sccp.cnpool_iucs.cnlinks); - - g_hnbgw->sccp.cnpool_iups = (struct hnbgw_cnpool){ - .domain = DOMAIN_PS, - .pool_name = "iups", - .peer_name = "sgsn", - .default_remote_pc = DEFAULT_PC_SGSN, - .vty = { - .nri_bitlen = OSMO_NRI_BITLEN_DEFAULT, - .null_nri_ranges = osmo_nri_ranges_alloc(g_hnbgw), - }, - .cnlink_ctrg_desc = &sgsn_ctrg_desc, - - .ctrs = rate_ctr_group_alloc(g_hnbgw, &iups_ctrg_desc, 0), - }; - INIT_LLIST_HEAD(&g_hnbgw->sccp.cnpool_iups.cnlinks); -} - -static struct hnb_context *hnb_context_by_id(uint32_t cid) -{ - struct hnb_context *hnb; - - llist_for_each_entry(hnb, &g_hnbgw->hnb_list, list) { - if (hnb->id.cid == cid) - return hnb; - } - - return NULL; -} - -struct hnb_context *hnb_context_by_identity_info(const char *identity_info) -{ - struct hnb_context *hnb; - - llist_for_each_entry(hnb, &g_hnbgw->hnb_list, list) { - if (strcmp(identity_info, hnb->identity_info) == 0) - return hnb; - } - - return NULL; -} +/*********************************************************************** + * UE Context + ***********************************************************************/ struct ue_context *ue_context_by_id(uint32_t id) { @@ -212,6 +137,141 @@ talloc_free(ue); } + +/*********************************************************************** + * HNB Context + ***********************************************************************/ + +/* look-up HNB context by id. Used from CTRL */ +static struct hnb_context *hnb_context_by_id(uint32_t cid) +{ + struct hnb_context *hnb; + + llist_for_each_entry(hnb, &g_hnbgw->hnb_list, list) { + if (hnb->id.cid == cid) + return hnb; + } + + return NULL; +} + +/* look-up HNB context by identity_info. Used from VTY */ +struct hnb_context *hnb_context_by_identity_info(const char *identity_info) +{ + struct hnb_context *hnb; + + llist_for_each_entry(hnb, &g_hnbgw->hnb_list, list) { + if (strcmp(identity_info, hnb->identity_info) == 0) + return hnb; + } + + return NULL; +} + +static int hnb_read_cb(struct osmo_stream_srv *conn); +static int hnb_closed_cb(struct osmo_stream_srv *conn); + +static struct hnb_context *hnb_context_alloc(struct osmo_stream_srv_link *link, int new_fd) +{ + struct hnb_context *ctx; + + ctx = talloc_zero(g_hnbgw, struct hnb_context); + if (!ctx) + return NULL; + INIT_LLIST_HEAD(&ctx->map_list); + + ctx->conn = osmo_stream_srv_create(g_hnbgw, link, new_fd, hnb_read_cb, hnb_closed_cb, ctx); + if (!ctx->conn) { + LOGP(DMAIN, LOGL_INFO, "error while creating connection\n"); + talloc_free(ctx); + return NULL; + } + + llist_add_tail(&ctx->list, &g_hnbgw->hnb_list); + return ctx; +} + +const char *umts_cell_id_name(const struct umts_cell_id *ucid) +{ + return talloc_asprintf(OTC_SELECT, "%u-%u-L%u-R%u-S%u-C%u", ucid->mcc, ucid->mnc, ucid->lac, ucid->rac, + ucid->sac, ucid->cid); +} + +const char *hnb_context_name(struct hnb_context *ctx) +{ + char *result; + if (!ctx) + return "NULL"; + + if (ctx->conn) { + char hostbuf_r[INET6_ADDRSTRLEN]; + char portbuf_r[6]; + int fd = osmo_stream_srv_get_ofd(ctx->conn)->fd; + + /* get remote addr */ + if (osmo_sock_get_ip_and_port(fd, hostbuf_r, sizeof(hostbuf_r), portbuf_r, sizeof(portbuf_r), false) == 0) + result = talloc_asprintf(OTC_SELECT, "%s:%s", hostbuf_r, portbuf_r); + else + result = "?"; + } else { + result = "disconnected"; + } + + if (g_hnbgw->config.log_prefix_hnb_id) + result = talloc_asprintf(OTC_SELECT, "%s %s", result, ctx->identity_info); + else + result = talloc_asprintf(OTC_SELECT, "%s %s", result, umts_cell_id_name(&ctx->id)); + return result; +} + +void hnb_context_release_ue_state(struct hnb_context *ctx) +{ + struct hnbgw_context_map *map, *map2; + + /* deactivate all context maps */ + llist_for_each_entry_safe(map, map2, &ctx->map_list, hnb_list) { + context_map_hnb_released(map); + /* hnbgw_context_map will remove itself from lists when it is ready. */ + } + ue_context_free_by_hnb(ctx); +} + +void hnb_context_release(struct hnb_context *ctx) +{ + struct hnbgw_context_map *map; + + LOGHNB(ctx, DMAIN, LOGL_INFO, "Releasing HNB context\n"); + + /* remove from the list of HNB contexts */ + llist_del(&ctx->list); + + hnb_context_release_ue_state(ctx); + + if (ctx->conn) { /* we own a conn, we must free it: */ + LOGHNB(ctx, DMAIN, LOGL_INFO, "Closing HNB SCTP connection %s\n", + osmo_sock_get_name2(osmo_stream_srv_get_ofd(ctx->conn)->fd)); + /* Avoid our closed_cb calling hnb_context_release() again: */ + osmo_stream_srv_set_data(ctx->conn, NULL); + osmo_stream_srv_destroy(ctx->conn); + } /* else: we are called from closed_cb, so conn is being freed separately */ + + /* hnbgw_context_map are still listed in ctx->map_list, but we are freeing ctx. Remove all entries from the + * list, but keep the hnbgw_context_map around for graceful release. They are also listed under + * hnbgw_cnlink->map_list, and will remove themselves when ready. */ + while ((map = llist_first_entry_or_null(&ctx->map_list, struct hnbgw_context_map, hnb_list))) { + llist_del(&map->hnb_list); + map->hnb_ctx = NULL; + } + + talloc_free(ctx); +} + + + +/*********************************************************************** + * SCTP Socket / stream handling + ***********************************************************************/ + static int hnb_read_cb(struct osmo_stream_srv *conn) { struct hnb_context *hnb = osmo_stream_srv_get_data(conn); @@ -331,101 +391,6 @@ return 0; } -static struct hnb_context *hnb_context_alloc(struct osmo_stream_srv_link *link, int new_fd) -{ - struct hnb_context *ctx; - - ctx = talloc_zero(g_hnbgw, struct hnb_context); - if (!ctx) - return NULL; - INIT_LLIST_HEAD(&ctx->map_list); - - ctx->conn = osmo_stream_srv_create(g_hnbgw, link, new_fd, hnb_read_cb, hnb_closed_cb, ctx); - if (!ctx->conn) { - LOGP(DMAIN, LOGL_INFO, "error while creating connection\n"); - talloc_free(ctx); - return NULL; - } - - llist_add_tail(&ctx->list, &g_hnbgw->hnb_list); - return ctx; -} - -const char *umts_cell_id_name(const struct umts_cell_id *ucid) -{ - return talloc_asprintf(OTC_SELECT, "%u-%u-L%u-R%u-S%u-C%u", ucid->mcc, ucid->mnc, ucid->lac, ucid->rac, - ucid->sac, ucid->cid); -} - -const char *hnb_context_name(struct hnb_context *ctx) -{ - char *result; - if (!ctx) - return "NULL"; - - if (ctx->conn) { - char hostbuf_r[INET6_ADDRSTRLEN]; - char portbuf_r[6]; - int fd = osmo_stream_srv_get_ofd(ctx->conn)->fd; - - /* get remote addr */ - if (osmo_sock_get_ip_and_port(fd, hostbuf_r, sizeof(hostbuf_r), portbuf_r, sizeof(portbuf_r), false) == 0) - result = talloc_asprintf(OTC_SELECT, "%s:%s", hostbuf_r, portbuf_r); - else - result = "?"; - } else { - result = "disconnected"; - } - - if (g_hnbgw->config.log_prefix_hnb_id) - result = talloc_asprintf(OTC_SELECT, "%s %s", result, ctx->identity_info); - else - result = talloc_asprintf(OTC_SELECT, "%s %s", result, umts_cell_id_name(&ctx->id)); - return result; -} - -void hnb_context_release_ue_state(struct hnb_context *ctx) -{ - struct hnbgw_context_map *map, *map2; - - /* deactivate all context maps */ - llist_for_each_entry_safe(map, map2, &ctx->map_list, hnb_list) { - context_map_hnb_released(map); - /* hnbgw_context_map will remove itself from lists when it is ready. */ - } - ue_context_free_by_hnb(ctx); -} - -void hnb_context_release(struct hnb_context *ctx) -{ - struct hnbgw_context_map *map; - - LOGHNB(ctx, DMAIN, LOGL_INFO, "Releasing HNB context\n"); - - /* remove from the list of HNB contexts */ - llist_del(&ctx->list); - - hnb_context_release_ue_state(ctx); - - if (ctx->conn) { /* we own a conn, we must free it: */ - LOGHNB(ctx, DMAIN, LOGL_INFO, "Closing HNB SCTP connection %s\n", - osmo_sock_get_name2(osmo_stream_srv_get_ofd(ctx->conn)->fd)); - /* Avoid our closed_cb calling hnb_context_release() again: */ - osmo_stream_srv_set_data(ctx->conn, NULL); - osmo_stream_srv_destroy(ctx->conn); - } /* else: we are called from closed_cb, so conn is being freed separately */ - - /* hnbgw_context_map are still listed in ctx->map_list, but we are freeing ctx. Remove all entries from the - * list, but keep the hnbgw_context_map around for graceful release. They are also listed under - * hnbgw_cnlink->map_list, and will remove themselves when ready. */ - while ((map = llist_first_entry_or_null(&ctx->map_list, struct hnbgw_context_map, hnb_list))) { - llist_del(&map->hnb_list); - map->hnb_ctx = NULL; - } - - talloc_free(ctx); -} - /*! call-back when the listen FD has something to read */ int hnbgw_rua_accept_cb(struct osmo_stream_srv_link *srv, int fd) { @@ -604,3 +569,59 @@ .go_parent_cb = hnbgw_vty_go_parent, .copyright = HNBGW_COPYRIGHT, }; + +void g_hnbgw_alloc(void *ctx) +{ + OSMO_ASSERT(!g_hnbgw); + g_hnbgw = talloc_zero(ctx, struct hnbgw); + + /* strdup so we can easily talloc_free in the VTY code */ + g_hnbgw->config.iuh_local_ip = talloc_strdup(g_hnbgw, HNBGW_LOCAL_IP_DEFAULT); + g_hnbgw->config.iuh_local_port = IUH_DEFAULT_SCTP_PORT; + g_hnbgw->config.log_prefix_hnb_id = true; + + /* Set zero PLMN to detect a missing PLMN when transmitting RESET */ + g_hnbgw->config.plmn = (struct osmo_plmn_id){ 0, 0, false }; + + g_hnbgw->next_ue_ctx_id = 23; + INIT_LLIST_HEAD(&g_hnbgw->hnb_list); + INIT_LLIST_HEAD(&g_hnbgw->ue_list); + INIT_LLIST_HEAD(&g_hnbgw->sccp.users); + + g_hnbgw->mgw_pool = mgcp_client_pool_alloc(g_hnbgw); + g_hnbgw->config.mgcp_client = mgcp_client_conf_alloc(g_hnbgw); + +#if ENABLE_PFCP + g_hnbgw->config.pfcp.remote_port = OSMO_PFCP_PORT; +#endif + + g_hnbgw->sccp.cnpool_iucs = (struct hnbgw_cnpool){ + .domain = DOMAIN_CS, + .pool_name = "iucs", + .peer_name = "msc", + .default_remote_pc = DEFAULT_PC_MSC, + .vty = { + .nri_bitlen = OSMO_NRI_BITLEN_DEFAULT, + .null_nri_ranges = osmo_nri_ranges_alloc(g_hnbgw), + }, + .cnlink_ctrg_desc = &msc_ctrg_desc, + + .ctrs = rate_ctr_group_alloc(g_hnbgw, &iucs_ctrg_desc, 0), + }; + INIT_LLIST_HEAD(&g_hnbgw->sccp.cnpool_iucs.cnlinks); + + g_hnbgw->sccp.cnpool_iups = (struct hnbgw_cnpool){ + .domain = DOMAIN_PS, + .pool_name = "iups", + .peer_name = "sgsn", + .default_remote_pc = DEFAULT_PC_SGSN, + .vty = { + .nri_bitlen = OSMO_NRI_BITLEN_DEFAULT, + .null_nri_ranges = osmo_nri_ranges_alloc(g_hnbgw), + }, + .cnlink_ctrg_desc = &sgsn_ctrg_desc, + + .ctrs = rate_ctr_group_alloc(g_hnbgw, &iups_ctrg_desc, 0), + }; + INIT_LLIST_HEAD(&g_hnbgw->sccp.cnpool_iups.cnlinks); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36080?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ia7ce60e6f80d10b7712de1aa6d8a30dd61690dcc Gerrit-Change-Number: 36080 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: umts_cell_id_name: Use 3-digit MCC and 2/3-digit MNC based on VTY config

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36202?usp=email ) Change subject: umts_cell_id_name: Use 3-digit MCC and 2/3-digit MNC based on VTY config ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36202?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I015ad84a6f61b4420f6bfdaa60e8e1b53a71589c Gerrit-Change-Number: 36202 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Mar 2024 08:57:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[L] Change in osmo-hnbgw[master]: [cosmetic] re-order hnbgw.c to group code in major blocks

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36080?usp=email ) Change subject: [cosmetic] re-order hnbgw.c to group code in major blocks ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36080?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ia7ce60e6f80d10b7712de1aa6d8a30dd61690dcc Gerrit-Change-Number: 36080 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Mar 2024 08:57:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmo-mgw[master]: migrate mgcp_client from osmo_wqueue to osmo_io

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36142?usp=email ) Change subject: migrate mgcp_client from osmo_wqueue to osmo_io ...................................................................... migrate mgcp_client from osmo_wqueue to osmo_io The new osmo_io framework means that we can [optionally] make use of the io_uring backend, which greatly reduces the syscall load compared to the legacy osmo_wqueue + osmo_select_main + read/write. We only use features already present in the intiial osmo_io support of libosmocore 1.9.0, so no entry in TODO-RELEASE is needed. Closes: OS#5754 Related: OS#5755 Change-Id: I766224da4691695c023d4d08d042a4bbeba05e47 --- M include/osmocom/mgcp_client/mgcp_client_internal.h M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp-client/mgcp_client_vty.c 3 files changed, 75 insertions(+), 55 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve jolly: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/mgcp_client/mgcp_client_internal.h b/include/osmocom/mgcp_client/mgcp_client_internal.h index 423c00e..26fbc7d 100644 --- a/include/osmocom/mgcp_client/mgcp_client_internal.h +++ b/include/osmocom/mgcp_client/mgcp_client_internal.h @@ -1,6 +1,6 @@ #pragma once -#include <osmocom/core/write_queue.h> +#include <osmocom/core/osmo_io.h> #include <osmocom/core/timer.h> #define MSGB_CB_MGCP_TRANS_ID 0 @@ -13,7 +13,7 @@ struct mgcp_client { struct mgcp_client_conf actual; - struct osmo_wqueue wq; + struct osmo_io_fd *iofd; mgcp_trans_id_t next_trans_id; struct llist_head responses_pending; struct mgcp_client_pool_member *pool_member; diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 489ce69..8b311d3 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -728,7 +728,7 @@ /* Feed an MGCP message into the receive processing. * Parse the head and call any callback registered for the transaction id found * in the MGCP message. This is normally called directly from the internal - * mgcp_do_read that reads from the socket connected to the MGCP gateway. This + * mgcp_read_cb that reads from the socket connected to the MGCP gateway. This * function is published mainly to be able to feed data from the test suite. */ int mgcp_client_rx(struct mgcp_client *mgcp, struct msgb *msg) @@ -781,55 +781,54 @@ return rc; } -static int mgcp_do_read(struct osmo_fd *fd) +static void mgcp_read_cb(struct osmo_io_fd *iofd, int res, struct msgb *msg) { - struct mgcp_client *mgcp = fd->data; - struct msgb *msg; - int ret; + struct mgcp_client *mgcp = osmo_iofd_get_data(iofd); - msg = msgb_alloc_headroom(4096, 128, "mgcp_from_gw"); - if (!msg) { - LOGPMGW(mgcp, LOGL_ERROR, "Failed to allocate MGCP message.\n"); - return -1; - } - - /* msgb_tailroom() is basically (4096 - 128); -1 is for '\0' */ - ret = read(fd->fd, msg->data, msgb_tailroom(msg) - 1); - if (ret <= 0) { + if (res <= 0) { LOGPMGW(mgcp, LOGL_ERROR, "Failed to read: %s: %d='%s'\n", - osmo_sock_get_name2(fd->fd), errno, strerror(errno)); + osmo_iofd_get_name(iofd), res, strerror(res)); msgb_free(msg); - return -1; + return; } - msg->l2h = msgb_put(msg, ret); - ret = mgcp_client_rx(mgcp, msg); + msg->l2h = msg->head; + mgcp_client_rx(mgcp, msg); talloc_free(msg); - return ret; } -static int mgcp_do_write(struct osmo_fd *fd, struct msgb *msg) +static int mgcp_do_write(struct mgcp_client *mgcp, struct msgb *msg) { int ret; - struct mgcp_client *mgcp = fd->data; LOGPMGW(mgcp, LOGL_DEBUG, "Tx MGCP: %s: len=%u '%s'...\n", - osmo_sock_get_name2(fd->fd), msg->len, + osmo_iofd_get_name(mgcp->iofd), msg->len, osmo_escape_str((const char *)msg->data, OSMO_MIN(42, msg->len))); - ret = write(fd->fd, msg->data, msg->len); - if (OSMO_UNLIKELY(ret != msg->len)) - LOGPMGW(mgcp, LOGL_ERROR, "Failed to Tx MGCP: %s: %d='%s'; msg: len=%u '%s'...\n", - osmo_sock_get_name2(fd->fd), errno, strerror(errno), - msg->len, osmo_escape_str((const char *)msg->data, OSMO_MIN(42, msg->len))); + ret = osmo_iofd_write_msgb(mgcp->iofd, msg); + if (ret < 0) + msgb_free(msg); /* Re-arm the keepalive Tx timer: */ if (mgcp->actual.keepalive.req_interval_sec > 0) osmo_timer_schedule(&mgcp->keepalive_tx_timer, mgcp->actual.keepalive.req_interval_sec, 0); + return ret; } +static void mgcp_write_cb(struct osmo_io_fd *iofd, int res, struct msgb *msg) +{ + struct mgcp_client *mgcp = osmo_iofd_get_data(iofd); + + if (OSMO_UNLIKELY(res != msg->len)) { + LOGPMGW(mgcp, LOGL_ERROR, "Failed to Tx MGCP: %s: %d='%s'; msg: len=%u '%s'...\n", + osmo_iofd_get_name(mgcp->iofd), res, strerror(res), + msg->len, osmo_escape_str((const char *)msg->data, OSMO_MIN(42, msg->len))); + } +} + + static const char *_mgcp_client_name_append_domain(const struct mgcp_client *mgcp, const char *name) { static char endpoint[MGCP_ENDPOINT_MAXLEN]; @@ -941,11 +940,6 @@ if (conf->description) mgcp->actual.description = talloc_strdup(mgcp, conf->description); - osmo_wqueue_init(&mgcp->wq, 1024); - mgcp->wq.read_cb = mgcp_do_read; - mgcp->wq.write_cb = mgcp_do_write; - osmo_fd_setup(&mgcp->wq.bfd, -1, OSMO_FD_READ, osmo_wqueue_bfd_cb, mgcp, 0); - memcpy(&mgcp->actual.keepalive, &conf->keepalive, sizeof(conf->keepalive)); osmo_timer_setup(&mgcp->keepalive_tx_timer, mgcp_client_keepalive_tx_timer_cb, mgcp); osmo_timer_setup(&mgcp->keepalive_rx_timer, mgcp_client_keepalive_rx_timer_cb, mgcp); @@ -953,6 +947,11 @@ return mgcp; } +static const struct osmo_io_ops mgcp_clnt_ioops = { + .read_cb = mgcp_read_cb, + .write_cb = mgcp_write_cb, +}; + /*! Initialize client connection (opens socket) * \param[in,out] mgcp MGCP client descriptor. * \returns 0 on success, -EINVAL on error. */ @@ -968,19 +967,28 @@ return -EINVAL; } - rc = osmo_sock_init2_ofd(&mgcp->wq.bfd, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, mgcp->actual.local_addr, - mgcp->actual.local_port, mgcp->actual.remote_addr, mgcp->actual.remote_port, - OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT); + rc = osmo_sock_init2(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, mgcp->actual.local_addr, + mgcp->actual.local_port, mgcp->actual.remote_addr, mgcp->actual.remote_port, + OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT); if (rc < 0) { LOGPMGW(mgcp, LOGL_FATAL, "Failed to initialize socket %s:%u -> %s:%u for MGW: %s\n", mgcp->actual.local_addr ? mgcp->actual.local_addr : "(any)", mgcp->actual.local_port, mgcp->actual.remote_addr ? mgcp->actual.local_addr : "(any)", mgcp->actual.remote_port, strerror(errno)); - goto error_close_fd; + goto error_free; } - LOGPMGW(mgcp, LOGL_INFO, "MGW connection: %s\n", osmo_sock_get_name2(mgcp->wq.bfd.fd)); + mgcp->iofd = osmo_iofd_setup(mgcp, rc, osmo_sock_get_name2(rc), OSMO_IO_FD_MODE_READ_WRITE, + &mgcp_clnt_ioops, mgcp); + if (!mgcp->iofd) + goto error_close_fd; + + LOGPMGW(mgcp, LOGL_INFO, "MGW connection: %s\n", osmo_iofd_get_name(mgcp->iofd)); + + osmo_iofd_register(mgcp->iofd, -1); + osmo_iofd_set_alloc_info(mgcp->iofd, 4096, 128); + osmo_iofd_set_txqueue_max_length(mgcp->iofd, 1024); /* If configured, send a DLCX message to the endpoints that are configured to * be reset on startup. Usually this is a wildcarded endpoint. */ @@ -1006,9 +1014,10 @@ osmo_timer_schedule(&mgcp->keepalive_rx_timer, mgcp->actual.keepalive.timeout_sec, 0); return 0; + error_close_fd: - close(mgcp->wq.bfd.fd); - mgcp->wq.bfd.fd = -1; + close(rc); +error_free: return rc; } @@ -1025,8 +1034,6 @@ * \returns 0 on success, -EINVAL on error. */ void mgcp_client_disconnect(struct mgcp_client *mgcp) { - struct osmo_wqueue *wq; - if (!mgcp) { LOGP(DLMGCP, LOGL_FATAL, "MGCP client not initialized properly\n"); return; @@ -1037,13 +1044,9 @@ osmo_timer_del(&mgcp->keepalive_tx_timer); mgcp->conn_up = false; - wq = &mgcp->wq; - osmo_wqueue_clear(wq); - LOGPMGW(mgcp, LOGL_INFO, "MGCP association: %s -- closed!\n", osmo_sock_get_name2(wq->bfd.fd)); - if (osmo_fd_is_registered(&wq->bfd)) - osmo_fd_unregister(&wq->bfd); - close(wq->bfd.fd); - wq->bfd.fd = -1; + osmo_iofd_txqueue_clear(mgcp->iofd); + LOGPMGW(mgcp, LOGL_INFO, "MGCP association: %s -- closed!\n", osmo_iofd_get_name(mgcp->iofd)); + osmo_iofd_free(mgcp->iofd); } /*! Get the IP-Aaddress of the associated MGW as string. @@ -1197,10 +1200,9 @@ goto mgcp_tx_error; } - rc = osmo_wqueue_enqueue(&mgcp->wq, msg); + rc = mgcp_do_write(mgcp, msg); if (rc) { LOGPMGW(mgcp, LOGL_FATAL, "Could not queue message to MGW\n"); - msgb_free(msg); goto mgcp_tx_error; } else LOGPMGW(mgcp, LOGL_DEBUG, "Queued %u bytes for MGW\n", diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c index d57447c..9acb621 100644 --- a/src/libosmo-mgcp-client/mgcp_client_vty.c +++ b/src/libosmo-mgcp-client/mgcp_client_vty.c @@ -322,7 +322,7 @@ /* If client already exists, apply the change immediately if possible: */ mgcp->actual.keepalive.req_interval_sec = atoi(argv[0]); - if (mgcp->wq.bfd.fd != -1) { /* UDP MGCP socket connected */ + if (mgcp->iofd) { /* UDP MGCP socket connected */ if (mgcp->actual.keepalive.req_interval_sec > 0) { /* Re-schedule: */ osmo_timer_schedule(&mgcp->keepalive_tx_timer, mgcp->actual.keepalive.req_interval_sec, 0); @@ -375,7 +375,7 @@ /* If client already exists, apply the change immediately if possible: */ mgcp->actual.keepalive.timeout_sec = atoi(argv[0]); - if (mgcp->wq.bfd.fd != -1) { /* UDP MGCP socket connected */ + if (mgcp->iofd) { /* UDP MGCP socket connected */ if (mgcp->actual.keepalive.timeout_sec > 0) { /* Re-schedule: */ osmo_timer_schedule(&mgcp->keepalive_rx_timer, mgcp->actual.keepalive.timeout_sec, 0); @@ -680,7 +680,7 @@ const struct mgcp_client *cli = pool_member->client; vty_out(vty, "%% MGW %s%s", mgcp_client_pool_member_name(pool_member), VTY_NEWLINE); vty_out(vty, "%% MGCP link: %s,%s%s", - cli && cli->wq.bfd.fd != -1 ? "connected" : "disconnected", + cli && cli->iofd ? "connected" : "disconnected", cli && cli->conn_up ? ((cli->actual.keepalive.timeout_sec > 0) ? "UP" : "MAYBE") : "DOWN", -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36142?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I766224da4691695c023d4d08d042a4bbeba05e47 Gerrit-Change-Number: 36142 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in osmo-mgw[master]: migrate mgcp_client from osmo_wqueue to osmo_io

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36142?usp=email ) Change subject: migrate mgcp_client from osmo_wqueue to osmo_io ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36142?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I766224da4691695c023d4d08d042a4bbeba05e47 Gerrit-Change-Number: 36142 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Mar 2024 08:56:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmo-hnbgw[master]: Introduce counter for per-hnb cumulative active CS RAB duration

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36205?usp=email ) Change subject: Introduce counter for per-hnb cumulative active CS RAB duration ...................................................................... Introduce counter for per-hnb cumulative active CS RAB duration This counter can be used to determine the traffic in Erlangs per HNB. Change-Id: Iffb6a3f38239094551a12c872cd8474d02a5ad56 --- M include/osmocom/hnbgw/hnbgw.h M include/osmocom/hnbgw/mgw_fsm.h M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/mgw_fsm.c 4 files changed, 89 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/05/36205/1 diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index 3653838..98cdc34 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -19,6 +19,7 @@ #include <osmocom/mgcp_client/mgcp_client_pool.h> #define STORE_UPTIME_INTERVAL 10 /* seconds */ +#define HNB_STORE_RAB_DURATIONS_INTERVAL 1 /* seconds */ enum { DMAIN, @@ -96,6 +97,8 @@ HNB_CTR_RUA_UDT_UL, HNB_CTR_RUA_UDT_DL, + + HNB_CTR_RAB_ACTIVE_MILLISECONDS_TOTAL, }; enum hnb_stat { @@ -381,6 +384,8 @@ struct osmo_pfcp_endpoint *ep; struct osmo_pfcp_cp_peer *cp_peer; } pfcp; + + struct osmo_timer_list hnb_store_rab_durations_timer; }; extern struct hnbgw *g_hnbgw; diff --git a/include/osmocom/hnbgw/mgw_fsm.h b/include/osmocom/hnbgw/mgw_fsm.h index d4e989d..c96308d 100644 --- a/include/osmocom/hnbgw/mgw_fsm.h +++ b/include/osmocom/hnbgw/mgw_fsm.h @@ -5,3 +5,5 @@ int handle_rab_ass_req(struct hnbgw_context_map *map, struct msgb *ranap_msg, ranap_message *message); int mgw_fsm_handle_rab_ass_resp(struct hnbgw_context_map *map, struct msgb *ranap_msg, ranap_message *message); int mgw_fsm_release(struct hnbgw_context_map *map); + +uint64_t mgw_fsm_get_elapsed_ms(struct hnbgw_context_map *map, const struct timespec *now); diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index 418742e..773ac7b 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -42,6 +42,7 @@ #include <osmocom/hnbgw/hnbgw_rua.h> #include <osmocom/hnbgw/hnbgw_cn.h> #include <osmocom/hnbgw/context_map.h> +#include <osmocom/hnbgw/mgw_fsm.h> struct hnbgw *g_hnbgw = NULL; @@ -51,6 +52,35 @@ {} }; +/* update the active RAB duration rate_ctr for given HNB */ +static void hnb_store_rab_durations(struct hnb_context *hnb) +{ + struct hnbgw_context_map *map; + struct timespec now; + uint64_t elapsed_cs_rab_ms = 0; + + osmo_clock_gettime(CLOCK_MONOTONIC, &now); + + /* iterate over all context_maps (subscribers) */ + llist_for_each_entry(map, &hnb->map_list, hnb_list) { + elapsed_cs_rab_ms += mgw_fsm_get_elapsed_ms(map, &now); + } + + /* Export to rate countes. */ + rate_ctr_add(HNBP_CTR(hnb->persistent, HNB_CTR_RAB_ACTIVE_MILLISECONDS_TOTAL), elapsed_cs_rab_ms); +} + +static void hnbgw_store_hnb_rab_durations(void *data) +{ + struct hnb_context *hnb; + + llist_for_each_entry(hnb, &g_hnbgw->hnb_list, list) + hnb_store_rab_durations(hnb); + + /* Keep this timer ticking */ + osmo_timer_schedule(&g_hnbgw->hnb_store_rab_durations_timer, HNB_STORE_RAB_DURATIONS_INTERVAL, 0); +} + /*********************************************************************** * UE Context @@ -358,6 +388,9 @@ "rua:unit_data:ul", "Received RUA UnitData (UDT) in uplink" }, [HNB_CTR_RUA_UDT_DL] = { "rua:unit_data:dl", "Transmitted RUA UnitData (UDT) in downlink" }, + + [HNB_CTR_RAB_ACTIVE_MILLISECONDS_TOTAL] = { + "rab:cs:active_milliseconds:total", "Cumulative number of milliseconds of CS RAB activity" }, }; const struct rate_ctr_group_desc hnb_ctrg_desc = { @@ -814,4 +847,7 @@ osmo_timer_setup(&g_hnbgw->store_uptime_timer, hnbgw_store_hnb_uptime, g_hnbgw); osmo_timer_schedule(&g_hnbgw->store_uptime_timer, STORE_UPTIME_INTERVAL, 0); + + osmo_timer_setup(&g_hnbgw->hnb_store_rab_durations_timer, hnbgw_store_hnb_rab_durations, g_hnbgw); + osmo_timer_schedule(&g_hnbgw->hnb_store_rab_durations_timer, HNB_STORE_RAB_DURATIONS_INTERVAL, 0); } diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c index 6fd0e6a..864fd5d 100644 --- a/src/osmo-hnbgw/mgw_fsm.c +++ b/src/osmo-hnbgw/mgw_fsm.c @@ -1,4 +1,4 @@ -/* (C) 2021 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> +/* (C) 2021-2024 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> * All Rights Reserved * * Author: Philipp Maier @@ -123,6 +123,10 @@ struct osmo_sockaddr ci_hnb_crcx_ack_addr; char msc_rtp_addr[INET6_ADDRSTRLEN]; uint16_t msc_rtp_port; + + /* Timestamps to track active duration */ + struct timespec active_start; + struct timespec active_stored; }; struct osmo_tdef_state_timeout mgw_fsm_timeouts[32] = { @@ -554,6 +558,9 @@ } LOGPFSML(fi, LOGL_DEBUG, "HNB and MSC side call-legs completed!\n"); + + osmo_clock_gettime(CLOCK_MONOTONIC, &mgw_fsm_priv->active_start); + mgw_fsm_priv->active_stored = mgw_fsm_priv->active_start; } static void mgw_fsm_release_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) @@ -915,3 +922,30 @@ osmo_fsm_inst_dispatch(map->mgw_fi, MGW_EV_RELEASE, NULL); return 0; } + +/* determine the number of elapsed active RAB milli-seconds since last call */ +uint64_t mgw_fsm_get_elapsed_ms(struct hnbgw_context_map *map, const struct timespec *now) +{ + struct mgw_fsm_priv *mgw_fsm_priv; + struct timespec elapsed; + uint64_t elapsed_ms; + + if (!map->mgw_fi) + return 0; + + OSMO_ASSERT(map->mgw_fi->fsm == &mgw_fsm); + mgw_fsm_priv = map->mgw_fi->priv; + + /* Ignore RABs whose activation timestamps are not yet set. */ + if (mgw_fsm_priv->active_stored.tv_sec == 0 && mgw_fsm_priv->active_stored.tv_nsec == 0) + return 0; + + /* Calculate elapsed time since last storage */ + timespecsub(now, &mgw_fsm_priv->active_stored, &elapsed); + elapsed_ms = elapsed.tv_sec * 1000 + elapsed.tv_nsec / 1000000; + + /* Update storage time */ + mgw_fsm_priv->active_stored = *now; + + return elapsed_ms; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36205?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iffb6a3f38239094551a12c872cd8474d02a5ad56 Gerrit-Change-Number: 36205 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024