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

[M] Change in osmo-hnbgw[master]: use json to decode counters from nftables

by Jenkins Builder

Attention is currently required from: neels. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email ) Change subject: use json to decode counters from nftables ...................................................................... Patch Set 2: (2 comments) File src/osmo-hnbgw/nft_kpi.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15477): https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485/comment/c6d17c27_557d122d PS2, Line 266: json_array_foreach (nftables, i, item) { space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15477): https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485/comment/ef649c34_b6c04499 PS2, Line 294: json_array_foreach (expr, j, expr_item) { space prohibited between function name and open parenthesis '(' -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?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: Id4e7fa017c31945388a010d8581715d71482116b Gerrit-Change-Number: 36485 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Mar 2024 02:47:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in libosmocore[master]: sockaddr_str: add conversion to,from osmo_sockaddr

by neels

Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email ) Change subject: sockaddr_str: add conversion to,from osmo_sockaddr ...................................................................... Patch Set 2: (2 comments) Patchset: PS1: > I'm not feeling it -- we have the libfoo. […] Done Patchset: PS2: other patches use this, i'd like to merge. I am tempted to count the earlier +1 since there is an entry in TODO-RELEASE now. soon. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0df84b4bb8cb5d8434b735fa3a38e7f95be43e91 Gerrit-Change-Number: 36265 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Mar 2024 02:45:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in libosmocore[master]: sockaddr_str: add conversion to,from osmo_sockaddr

by neels

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: sockaddr_str: add conversion to,from osmo_sockaddr ...................................................................... sockaddr_str: add conversion to,from osmo_sockaddr Add functions to pass struct osmo_sockaddr to the osmo_sockaddr_str_{to,from}* API directly. So far the interface to osmo_sockaddr_str_ is: osmo_sockaddr_str_from_sockaddr(&my_sa_str, &my_osa->u.sas); I'm working a lot with osmo_sockaddr at the moment, and the cumulated time of forgetting to add 'u.sas' and having another compilation cycle because of those is justifying this additional API. Change-Id: I0df84b4bb8cb5d8434b735fa3a38e7f95be43e91 --- M TODO-RELEASE M include/osmocom/core/sockaddr_str.h M src/core/libosmocore.map M src/core/sockaddr_str.c 4 files changed, 48 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/65/36265/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0df84b4bb8cb5d8434b735fa3a38e7f95be43e91 Gerrit-Change-Number: 36265 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

[S] Change in libosmocore[master]: sockaddr_str: add conversion to,from osmo_sockaddr

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email ) Change subject: sockaddr_str: add conversion to,from osmo_sockaddr ...................................................................... Patch Set 1: (2 comments) Patchset: PS1: > Are you the one looking at tons of commit log lines every few months for +10 projects? I am, and I r […] I'm not feeling it -- we have the libfoo.map files showing similar information that is guaranteed to be correct. Commit log summary should show it. The git log is quick to search for the first appearance of a function. I don't want to sabotage the release process or whine and make your life harder, but I doubt maintaining such lists manually is a good idea. File src/core/libosmocore.map: https://gerrit.osmocom.org/c/libosmocore/+/36265/comment/cc092b05_5969feb2 PS1, Line 401: osmo_sockaddr_str_from_osa; here is a diff of added API -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0df84b4bb8cb5d8434b735fa3a38e7f95be43e91 Gerrit-Change-Number: 36265 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Mar 2024 02:36:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[M] Change in osmo-hnbgw[master]: use json to decode counters from nftables

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email ) Change subject: use json to decode counters from nftables ...................................................................... Patch Set 1: (2 comments) File src/osmo-hnbgw/nft_kpi.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15475): https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485/comment/a499530c_d95520ab PS1, Line 266: json_array_foreach (nftables, i, item) { space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15475): https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485/comment/9f3d3d71_2c6def1a PS1, Line 294: json_array_foreach (expr, j, expr_item) { space prohibited between function name and open parenthesis '(' -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?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: Id4e7fa017c31945388a010d8581715d71482116b Gerrit-Change-Number: 36485 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 27 Mar 2024 21:57:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[M] Change in osmo-hnbgw[master]: use json to decode counters from nftables

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email ) Change subject: use json to decode counters from nftables ...................................................................... use json to decode counters from nftables Switch nft output to json. Add libjansson dependency, and use it to parse the result. Navigate the json tree to retrieve the counter values. Parsing with json takes longer than the direct string parsing of nft language, but it is the more correct and more stable approach: in case nftables changes its API, json is likely to still be compatible. Related: SYS#6773 Change-Id: Id4e7fa017c31945388a010d8581715d71482116b --- M configure.ac M src/osmo-hnbgw/nft_kpi.c 2 files changed, 115 insertions(+), 72 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/85/36485/1 diff --git a/configure.ac b/configure.ac index bea9a76..657ad0d 100644 --- a/configure.ac +++ b/configure.ac @@ -60,6 +60,7 @@ PKG_CHECK_MODULES(LIBOSMOHNBAP, libosmo-hnbap >= 1.5.0) PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.12.0) PKG_CHECK_MODULES(LIBNFTABLES, libnftables >= 1.0.2) +PKG_CHECK_MODULES(LIBJANSSON, jansson >= 2.14) # Enable PFCP support for GTP tunnel mapping via UPF AC_ARG_ENABLE([pfcp], [AS_HELP_STRING([--enable-pfcp], [Build with PFCP support, for GTP tunnel mapping via UPF])], diff --git a/src/osmo-hnbgw/nft_kpi.c b/src/osmo-hnbgw/nft_kpi.c index 0dd702f..0b5ac91 100644 --- a/src/osmo-hnbgw/nft_kpi.c +++ b/src/osmo-hnbgw/nft_kpi.c @@ -19,6 +19,7 @@ #include <ctype.h> #include <inttypes.h> +#include <jansson.h> #include <nftables/libnftables.h> #include <osmocom/core/logging.h> @@ -51,7 +52,7 @@ OSMO_ASSERT(false); } - nft_ctx_output_set_flags(s->nft.nft_ctx, NFT_CTX_OUTPUT_HANDLE); + nft_ctx_output_set_flags(s->nft.nft_ctx, NFT_CTX_OUTPUT_JSON); return s->nft.nft_ctx; } @@ -219,99 +220,123 @@ &val->bytes, bytes); } -/* In the string section *pos .. end, find the first occurence of after_str and return the following token, which ends - * by a space or at end. If end is NULL, search until the '\0' termination of *pos. - * Return true if after_str was found, copy the following token into buf, and in *pos, return the position just after - * that token. */ -static bool get_token_after(char *buf, size_t buflen, const char **pos, const char *end, const char *after_str) +static int hnb_update_counters_by_id(const char *id_str, bool ul, int64_t packets, int64_t bytes, int64_t handle, + struct hnb_persistent **last_hnbp) { - const char *found = strstr(*pos, after_str); - const char *token_end; - size_t token_len; - if (!found) - return false; - if (end && found >= end) { - *pos = end; - return false; + struct hnb_persistent *hnbp; + LOGP(DNFT, LOGL_DEBUG, "%s(%s, %s, %"PRId64", %"PRId64", %"PRId64")\n", __func__, + id_str, ul ? "ul" : "dl", packets, bytes, handle); + + /* Half the time, we already have a pointer to the correct hnb */ + if (last_hnbp && *last_hnbp && !strcmp((*last_hnbp)->id_str, id_str)) + hnbp = *last_hnbp; + else + hnbp = hnb_persistent_find_by_id_str(id_str); + if (!hnbp) { + LOGP(DNFT, LOGL_DEBUG, "%s(): cannot update counters, hNodeB not found: %s\n", __func__, id_str); + return -ENOENT; } - found += strlen(after_str); - while (*found && *found == ' ' && (!end || found < end)) - found++; - token_end = found; - while (*token_end != ' ' && (!end || token_end < end)) - token_end++; - if (token_end <= found) { - *pos = found; - return false; - } - if (*found == '"' && token_end > found + 1 && *(token_end - 1) == '"') { - found++; - token_end--; - } - token_len = token_end - found; - token_len = OSMO_MIN(token_len, buflen - 1); - memcpy(buf, found, token_len); - buf[token_len] = '\0'; - *pos = token_end; - return true; + if (last_hnbp) + *last_hnbp = hnbp; + hnb_update_counters(hnbp, ul, packets, bytes, handle); + return 0; } static void decode_nft_response(const char *response) { struct nft_kpi_state *s = &g_nft_kpi_state; - const char *pos; - char buf[128]; + struct hnb_persistent *hnbp = NULL; + json_t *json; + json_error_t json_err; + + json_t *nftables; + json_t *item; + int i; int count = 0; - /* find and parse all occurences of strings like: - * [...] counter packets 3 bytes 129 comment "ul:001-01-L2-R3-S4-C1" # handle 10 - */ - pos = response; - while (*pos) { - const char *line_end; - int64_t packets; - int64_t bytes; - int64_t handle = 0; + json = json_loads(response, 0, &json_err); + if (!json) + goto json_err; + + nftables = json_object_get(json, "nftables"); + + if (!json_is_array(nftables)) + goto json_inval; + + json_array_foreach (nftables, i, item) { + json_t *rule = json_object_get(item, "rule"); + json_t *handle; + json_t *comment; + json_t *expr; + json_t *expr_item; + json_t *packets; + json_t *bytes; bool ul; - struct hnb_persistent *hnbp; + json_t *counter = NULL; + int j; + const char *comment_str; + const char *hnb_id; - if (!get_token_after(buf, sizeof(buf), &pos, NULL, "counter packets ")) - break; - if (osmo_str_to_int64(&packets, buf, 10, 0, INT64_MAX)) - break; - line_end = strchr(pos, '\n'); - if (!line_end) - line_end = pos + strlen(pos); + if (!rule) + continue; - if (!get_token_after(buf, sizeof(buf), &pos, line_end, "bytes ")) - break; - if (osmo_str_to_int64(&bytes, buf, 10, 0, INT64_MAX)) - break; + comment = json_object_get(rule, "comment"); + if (!comment || !json_is_string(comment)) + continue; - if (!get_token_after(buf, sizeof(buf), &pos, line_end, "comment ")) - break; + handle = json_object_get(rule, "handle"); + if (!handle || !json_is_integer(handle)) + continue; - if (osmo_str_startswith(buf, "ul:")) + expr = json_object_get(rule, "expr"); + if (!json_is_array(expr)) + continue; + json_array_foreach (expr, j, expr_item) { + counter = json_object_get(expr_item, "counter"); + if (counter && !json_is_object(counter)) + counter = NULL; + if (counter) + break; + } + + if (!counter) + continue; + + packets = json_object_get(counter, "packets"); + if (!packets || !json_is_integer(packets)) + continue; + bytes = json_object_get(counter, "bytes"); + if (!bytes || !json_is_integer(bytes)) + continue; + + comment_str = json_string_value(comment); + if (osmo_str_startswith(comment_str, "ul:")) ul = true; - else if (osmo_str_startswith(buf, "dl:")) + else if (osmo_str_startswith(comment_str, "dl:")) ul = false; else - break; + continue; + hnb_id = comment_str + 3; - hnbp = hnb_persistent_find_by_id_str(buf + 3); - if (!hnbp) - break; - - if (!get_token_after(buf, sizeof(buf), &pos, line_end, "# handle ")) - break; - if (osmo_str_to_int64(&handle, buf, 10, 0, INT64_MAX)) - break; - - hnb_update_counters(hnbp, ul, packets, bytes, handle); + if (hnb_update_counters_by_id(hnb_id, + ul, + json_integer_value(packets), + json_integer_value(bytes), + json_integer_value(handle), + &hnbp)) + continue; count++; } LOGP(DNFT, LOGL_DEBUG, "read %d counters from nft table %s\n", count, s->nft.table_name); + return; + +json_err: + LOGP(DNFT, LOGL_ERROR, "failed to decode nft response: %d: %s\n", + json_err.line, json_err.text); + return; +json_inval: + LOGP(DNFT, LOGL_ERROR, "unexpected structure in nft response\n"); } void nft_kpi_read_counters(void) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?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: Id4e7fa017c31945388a010d8581715d71482116b Gerrit-Change-Number: 36485 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej()

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481?usp=email ) Change subject: HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej() ...................................................................... Patch Set 3: (1 comment) File src/osmo-hnbgw/hnbgw_hnbap.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481/comment/8308cc6f_5184dab1 PS3, Line 213: char imsi[16]; we probably have defined for this 16? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481?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: I2e00968cbf686f78f5c9655e899963f2b84dd78b Gerrit-Change-Number: 36481 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 27 Mar 2024 21:22:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce tests about UE registration

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36484?usp=email ) Change subject: hnbgw: Introduce tests about UE registration ...................................................................... Patch Set 1: (1 comment) File hnbgw/HNBGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36484/comment/22edbf71_a965… PS1, Line 1011: testcase TC_ue_register_before_hnb_register() runs on test_CT { You are missing adding these tests to control()? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36484?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ice2743d376ab8041646259fa25117d6fd0e8c2fd Gerrit-Change-Number: 36484 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 27 Mar 2024 21:21:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Qualify RAC/LAI/SAI to RANAP_IEs module

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36483?usp=email ) Change subject: hnbgw: Qualify RAC/LAI/SAI to RANAP_IEs module ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36483?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2fb7ca8dfc2011c727633e795a9d16856825379d Gerrit-Change-Number: 36483 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 27 Mar 2024 21:18:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Rename f_hnbap_register to f_hnbap_hnb_register

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36482?usp=email ) Change subject: hnbgw: Rename f_hnbap_register to f_hnbap_hnb_register ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36482?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I171f0385389c5f50dc7ad28525deef396fff5fbf Gerrit-Change-Number: 36482 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 27 Mar 2024 21:18:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024