- gerrit-log - lists.osmocom.org

[XS] Change in osmo-upf[master]: contrib/pfcp-tool-scripts: adjust tunend_session_est.vty and upf cfg ...
by neels 23 Aug '24

23 Aug '24

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/37827?usp=email ) Change subject: contrib/pfcp-tool-scripts: adjust tunend_session_est.vty and upf cfg to match up ...................................................................... contrib/pfcp-tool-scripts: adjust tunend_session_est.vty and upf cfg to match up Change-Id: I3d6a26b45f084c281887bee541cf01b690c9d1de --- M contrib/osmo-pfcp-tool-scripts/osmo-upf-12.cfg M contrib/osmo-pfcp-tool-scripts/tunend_session_est.vty 2 files changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/contrib/osmo-pfcp-tool-scripts/osmo-upf-12.cfg b/contrib/osmo-pfcp-tool-scripts/osmo-upf-12.cfg index b639e96..4577a94 100644 --- a/contrib/osmo-pfcp-tool-scripts/osmo-upf-12.cfg +++ b/contrib/osmo-pfcp-tool-scripts/osmo-upf-12.cfg @@ -23,3 +23,7 @@ local-addr 127.0.0.12 tunmap table-name osmo-upf-12 + +# gtp-dev only for GTP-U Echo service +tunend + dev create gtp-echo-12 127.0.0.12 diff --git a/contrib/osmo-pfcp-tool-scripts/tunend_session_est.vty b/contrib/osmo-pfcp-tool-scripts/tunend_session_est.vty index 89a4629..2cefc09 100644 --- a/contrib/osmo-pfcp-tool-scripts/tunend_session_est.vty +++ b/contrib/osmo-pfcp-tool-scripts/tunend_session_est.vty @@ -1,5 +1,5 @@ timer pfcp x23 0 -pfcp-peer 127.0.0.1 +pfcp-peer 127.0.0.11 tx assoc-setup-req sleep 1 session tunend -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/37827?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I3d6a26b45f084c281887bee541cf01b690c9d1de Gerrit-Change-Number: 37827 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>

1 0

[S] Change in osmo-upf[master]: upf gtp-u echo: rx Echo Response messages
by neels 23 Aug '24

23 Aug '24

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/37829?usp=email ) Change subject: upf gtp-u echo: rx Echo Response messages ...................................................................... upf gtp-u echo: rx Echo Response messages Support receiving of Echo Responses, so far showed an error log for unsupported message type. Just log the message. Prep for upcoming patch to allow sending Echo Requests from VTY. Change-Id: Idad417746a1ea797e8fbfe04ca9c84923a6118fa --- M src/osmo-upf/upf_gtpu_echo.c 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/osmo-upf/upf_gtpu_echo.c b/src/osmo-upf/upf_gtpu_echo.c index d8958e8..b234065 100644 --- a/src/osmo-upf/upf_gtpu_echo.c +++ b/src/osmo-upf/upf_gtpu_echo.c @@ -65,6 +65,21 @@ return tx_echo_resp(dev, remote, rx_h->ext.seq_nr); } +static void rx_echo_resp(struct upf_gtp_dev *dev, const struct osmo_sockaddr *remote, const struct gtp1u_hdr *rx_h, + size_t msg_len) +{ + if (msg_len < (sizeof(*rx_h) + 2)) { + LOG_GTP_DEV(dev, LOGL_ERROR, + "<- %s: rx GTPv1-U Echo Response, but message is too short (%zu < %zu)\n", + osmo_sockaddr_to_str_c(OTC_SELECT, remote), msg_len, (sizeof(*rx_h) + 2)); + return; + } + + uint8_t recovery_count = rx_h->data2[1]; + LOG_GTP_DEV(dev, LOGL_INFO, "<- %s: rx GTPv1-U Echo Response: seq_nr=%u recovery_count=%u\n", + osmo_sockaddr_to_str(remote), rx_h->ext.seq_nr, recovery_count); +} + static int tx_echo_resp(struct upf_gtp_dev *dev, const struct osmo_sockaddr *remote, uint16_t seq_nr) { struct msgb *msg; @@ -153,6 +168,9 @@ switch (h->msg_type) { case GTP1U_MSGTYPE_ECHO_REQ: return rx_echo_req(dev, &remote, h, sz); + case GTP1U_MSGTYPE_ECHO_RSP: + rx_echo_resp(dev, &remote, h, sz); + return 0; default: LOG_GTP_DEV(dev, LOGL_ERROR, "rx: GTPv1-U message type %u not supported\n", h->msg_type); return -1; -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/37829?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Idad417746a1ea797e8fbfe04ca9c84923a6118fa Gerrit-Change-Number: 37829 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>

1 0

[S] Change in osmo-upf[master]: upf gtp-u echo: improve loging
by neels 23 Aug '24

23 Aug '24

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/37828?usp=email ) Change subject: upf gtp-u echo: improve loging ...................................................................... upf gtp-u echo: improve loging Tweak GTPv1-U Echo logging to more consistently show logging like: DGTP INFO apn11 [23] 127.0.0.11:2152: <- 127.0.0.12:2152: rx GTPv1-U Echo Request: seq_nr=123 recovery_count=131 DGTP INFO apn11 [23] 127.0.0.11:2152: -> 127.0.0.12:2152: tx GTPv1-U Echo Response: seq_nr=123 recovery_count=570 Change-Id: I3c7fe7c3eb1467ae34085da6bbf26a935a6c927b --- M src/osmo-upf/upf_gtpu_echo.c 1 file changed, 27 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/osmo-upf/upf_gtpu_echo.c b/src/osmo-upf/upf_gtpu_echo.c index cbf804b..d8958e8 100644 --- a/src/osmo-upf/upf_gtpu_echo.c +++ b/src/osmo-upf/upf_gtpu_echo.c @@ -50,12 +50,17 @@ static int tx_echo_resp(struct upf_gtp_dev *dev, const struct osmo_sockaddr *remote, uint16_t seq_nr); -static int rx_echo_req(struct upf_gtp_dev *dev, const struct osmo_sockaddr *remote, const struct gtp1u_hdr *rx_h) +static int rx_echo_req(struct upf_gtp_dev *dev, const struct osmo_sockaddr *remote, const struct gtp1u_hdr *rx_h, + size_t msg_len) { - if (!rx_h->s) { - LOG_GTP_DEV(dev, LOGL_ERROR, "rx GTPv1-U ECHO REQ without sequence nr\n"); - return -1; - } + uint16_t seq_nr = 0; + uint8_t recovery_count = 0; + if (msg_len >= (sizeof(*rx_h) + 2) && rx_h->data2[0] == GTP1U_IEI_RECOVERY) + recovery_count = rx_h->data2[1]; + + seq_nr = rx_h->s; + LOG_GTP_DEV(dev, LOGL_INFO, "<- %s: rx GTPv1-U Echo Request: seq_nr=%u recovery_count=%u\n", + osmo_sockaddr_to_str(remote), seq_nr, recovery_count); return tx_echo_resp(dev, remote, rx_h->ext.seq_nr); } @@ -66,7 +71,7 @@ struct gtp1u_hdr *tx_h; int rc; - msg = msgb_alloc_headroom(1024, 128, "GTP-echo-resp"); + msg = msgb_alloc_headroom(1024, 128, "GTPv1-U-echo-resp"); tx_h = (void *)msgb_put(msg, sizeof(*tx_h)); *tx_h = (struct gtp1u_hdr){ @@ -90,9 +95,13 @@ rc = sendto(dev->gtpv1.ofd.fd, msgb_data(msg), msgb_length(msg), 0, &remote->u.sa, sizeof(*remote)); if (rc < 0) { - int err = errno; - LOG_GTP_DEV(dev, LOGL_ERROR, "GTP1-U sendto(len=%d, to=%s): %s\n", msgb_length(msg), - osmo_sockaddr_to_str(remote), strerror(err)); + rc = -errno; + LOG_GTP_DEV(dev, LOGL_ERROR, "-> %s: tx GTPv1-U Echo Response: sendto(len=%d): %s\n", + osmo_sockaddr_to_str(remote), msgb_length(msg), strerror(-rc)); + } else { + LOG_GTP_DEV(dev, LOGL_INFO, "-> %s: tx GTPv1-U Echo Response: seq_nr=%u recovery_count=%u\n", + osmo_sockaddr_to_str(remote), seq_nr, g_upf->tunend.recovery_count); + rc = 0; } msgb_free(msg); return rc; @@ -121,27 +130,29 @@ /* A GTPv1-U header of size 8 is valid, but this code expects to handle only ECHO REQUEST messages. These are * required to have a sequence number, hence this check here consciously uses the full sizeof(*h) == 12. */ if (sz < sizeof(*h)) { - LOG_GTP_DEV(dev, LOGL_ERROR, "rx GTP packet smaller than the GTPv1-U header + sequence nr: %zd < %zu\n", - sz, sizeof(*h)); + LOG_GTP_DEV(dev, LOGL_ERROR, + "<- %s: rx GTPv1-U packet smaller than the GTPv1-U header + sequence nr: %zd < %zu\n", + osmo_sockaddr_to_str(&remote), sz, sizeof(*h)); return -1; } h = (const struct gtp1u_hdr *)buf; if (h->version != 1) { - LOG_GTP_DEV(dev, LOGL_ERROR, "rx GTP v%u: only GTP version 1 supported\n", h->version); + LOG_GTP_DEV(dev, LOGL_ERROR, "<- %s: rx GTPv1-U v%u: only GTP version 1 supported\n", + osmo_sockaddr_to_str(&remote), h->version); return -1; } h_length = osmo_load16be(&h->length); if (offsetof(struct gtp1u_hdr, data1) + h_length > sz) { - LOG_GTP_DEV(dev, LOGL_ERROR, "rx GTP: header + h.length = %zu > received bytes = %zd\n", - offsetof(struct gtp1u_hdr, data1) + h_length, sz); + LOG_GTP_DEV(dev, LOGL_ERROR, "<- %s: rx GTPv1-U: header + h.length = %zu > received bytes = %zd\n", + osmo_sockaddr_to_str(&remote), offsetof(struct gtp1u_hdr, data1) + h_length, sz); return -1; } switch (h->msg_type) { case GTP1U_MSGTYPE_ECHO_REQ: - return rx_echo_req(dev, &remote, h); + return rx_echo_req(dev, &remote, h, sz); default: LOG_GTP_DEV(dev, LOGL_ERROR, "rx: GTPv1-U message type %u not supported\n", h->msg_type); return -1; @@ -151,7 +162,7 @@ int upf_gtpu_echo_setup(struct upf_gtp_dev *dev) { if (dev->gtpv1.ofd.fd == -1) { - LOGP(DGTP, LOGL_ERROR, "Cannot setup GTP-U ECHO: GTP-v1 socket not initialized\n"); + LOGP(DGTP, LOGL_ERROR, "Cannot setup GTPv1-U ECHO: socket not initialized\n"); return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/37828?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I3c7fe7c3eb1467ae34085da6bbf26a935a6c927b Gerrit-Change-Number: 37828 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>

1 0

[XS] Change in osmo-upf[master]: drop unreachable statement
by neels 23 Aug '24

23 Aug '24

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/37826?usp=email ) Change subject: drop unreachable statement ...................................................................... drop unreachable statement Change-Id: I0710fd0e38a5ce26ac532ab7150e285f171accfb --- M src/osmo-upf/upf_gtpu_echo.c 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-upf/upf_gtpu_echo.c b/src/osmo-upf/upf_gtpu_echo.c index 0d93299..cbf804b 100644 --- a/src/osmo-upf/upf_gtpu_echo.c +++ b/src/osmo-upf/upf_gtpu_echo.c @@ -146,8 +146,6 @@ LOG_GTP_DEV(dev, LOGL_ERROR, "rx: GTPv1-U message type %u not supported\n", h->msg_type); return -1; } - - return 0; } int upf_gtpu_echo_setup(struct upf_gtp_dev *dev) -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/37826?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I0710fd0e38a5ce26ac532ab7150e285f171accfb Gerrit-Change-Number: 37826 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>

1 0

[XS] Change in osmo-upf[master]: fix msgb memleak on GTP echo response
by neels 23 Aug '24

23 Aug '24

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/37824?usp=email ) Change subject: fix msgb memleak on GTP echo response ...................................................................... fix msgb memleak on GTP echo response Change-Id: I2bd2e9c57bf392074eed9628a69eb710d4e459a6 --- M src/osmo-upf/upf_gtpu_echo.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-upf/upf_gtpu_echo.c b/src/osmo-upf/upf_gtpu_echo.c index b251a94..0d93299 100644 --- a/src/osmo-upf/upf_gtpu_echo.c +++ b/src/osmo-upf/upf_gtpu_echo.c @@ -94,6 +94,7 @@ LOG_GTP_DEV(dev, LOGL_ERROR, "GTP1-U sendto(len=%d, to=%s): %s\n", msgb_length(msg), osmo_sockaddr_to_str(remote), strerror(err)); } + msgb_free(msg); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/37824?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I2bd2e9c57bf392074eed9628a69eb710d4e459a6 Gerrit-Change-Number: 37824 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>

1 0

[XS] Change in osmo-upf[master]: fix EXTRA_DIST for vty test scripts
by neels 23 Aug '24

23 Aug '24

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/37825?usp=email ) Change subject: fix EXTRA_DIST for vty test scripts ...................................................................... fix EXTRA_DIST for vty test scripts Like e.g. in osmo-msc.git, osmo-bsc.git, use wildcard $(srcdir)/*.vty to make sure we never forget to distribute committed VTY test scripts. Change-Id: If4dca81ce287ce1b1af32057634af912a8b89665 --- M tests/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/tests/Makefile.am b/tests/Makefile.am index 5e1d517..ef55b97 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -21,7 +21,7 @@ } >'$(srcdir)/package.m4' EXTRA_DIST = \ - upf.vty \ + $(srcdir)/*.vty \ testsuite.at \ $(srcdir)/package.m4 \ $(TESTSUITE) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/37825?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: If4dca81ce287ce1b1af32057634af912a8b89665 Gerrit-Change-Number: 37825 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>

1 0

[M] Change in libosmocore[master]: CTRL: get rate_ctr_group by the id from rate_ctr_group_set_name()
by neels 23 Aug '24

23 Aug '24

Attention is currently required from: laforge, pespin. neels has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/libosmocore/+/37881?usp=email ) Change subject: CTRL: get rate_ctr_group by the id from rate_ctr_group_set_name() ...................................................................... Patch Set 4: (1 comment) Patchset: PS2: > we actually still do a lot of linear iteration all over our CNI programs for finding conn state. […] I've been thinking about the main purpose for this: our test suite. "proper" users would use the stats export instead. In that light, it seems we should just accept the inefficient lookup. Aaand, I wonder if we should drop this patch (and the ttcn3 CTRL patch) entirely and instead use the stats exporter in HNBGW_Tests.ttcn to verify counters. We already have the StatsD_Checker.ttcn, shouldn't be too much effort to build on that? i.e. move away from CTRL instead of spending time on its quirks. The only thing in my mind against this is that the CTRL patch is already done now, and changing HNBGW_Tests.ttcn to stats is basically a whole new task. thoughts? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37881?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I841a12f76e6fcb2bd7aecb5f4b1707d9ec927137 Gerrit-Change-Number: 37881 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Aug 2024 00:49:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 0

[M] Change in libosmocore[master]: CTRL: get rate_ctr_group by the id from rate_ctr_group_set_name()
by neels 23 Aug '24

23 Aug '24

Attention is currently required from: laforge, pespin. neels has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/libosmocore/+/37881?usp=email ) Change subject: CTRL: get rate_ctr_group by the id from rate_ctr_group_set_name() ...................................................................... Patch Set 4: (1 comment) Patchset: PS2: > this is a valid point, wondering why it is marked resolved? unmarking. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37881?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I841a12f76e6fcb2bd7aecb5f4b1707d9ec927137 Gerrit-Change-Number: 37881 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Aug 2024 00:36:27 +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>

1 0

[M] Change in libosmocore[master]: CTRL: get rate_ctr_group by the id from rate_ctr_group_set_name()
by neels 23 Aug '24

23 Aug '24

Attention is currently required from: laforge, neels, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/37881?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review-1 by neels, Verified+1 by Jenkins Builder Change subject: CTRL: get rate_ctr_group by the id from rate_ctr_group_set_name() ...................................................................... CTRL: get rate_ctr_group by the id from rate_ctr_group_set_name() In CTRL, add keyword "by_id" to use the given name for group instance lookup. IOW, in addition to currently: GET 123 rate_ctr.abs.hnb.0.iuh:established also implement: GET 123 rate_ctr.abs.hnb.by_id.001-01-L2342-R0-S55-C1.iuh:established Some objects always have fixed indexes, because they come from the config file (think "bts.0" or "msc.0"). However, some object IDs are created dynamically, which makes it "impossible" to verify them in tests. In osmo-hnbgw, the same hNodeB may show up as hnb.0, hnb.1, etc. We do already have the rate_ctr_group_set_name() API which allows tagging an identifier on a rate counter group. For above example, osmo-hnbgw sets rate_ctr_group_set_name(cell_id_str). When merging this patch, magically all rate_ctr_groups in all osmo programs will become accessible by their given rate_ctr_group_set_name() IDs. This also means that the strings passed to rate_ctr_group_set_name() now are required to be a valid identifier, to not mix up the CTRL interface syntax. So far, only log an error, to figure out if we need mangling. Related: OS#6545 Change-Id: I841a12f76e6fcb2bd7aecb5f4b1707d9ec927137 --- M include/osmocom/core/rate_ctr.h M src/core/libosmocore.map M src/core/rate_ctr.c M src/ctrl/control_if.c 4 files changed, 65 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/81/37881/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37881?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I841a12f76e6fcb2bd7aecb5f4b1707d9ec927137 Gerrit-Change-Number: 37881 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmocore[master]: CTRL: get rate_ctr_group by the id from rate_ctr_group_set_name()
by neels 22 Aug '24

22 Aug '24

Attention is currently required from: laforge, pespin. neels has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/libosmocore/+/37881?usp=email ) Change subject: CTRL: get rate_ctr_group by the id from rate_ctr_group_set_name() ...................................................................... Patch Set 3: (1 comment) Patchset: PS2: > (another resolved comment with a valid point, unresolving) we actually still do a lot of linear iteration all over our CNI programs for finding conn state. (and did I mention the value_string iterations =) either way: So far we have in rate_ctr.c: static LLIST_HEAD(rate_ctr_groups); we can easily add a hashtable next to it and populate the hashtable as rate_ctr_group_set_name() is called. We only have to extend the public struct rate_ctr_group to add a hash entry. The struct rate_ctr_group should always be allocated via rate_ctr_group_alloc(), so it is ABI compatible when we add the hashtable entry in the end. yes? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37881?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I841a12f76e6fcb2bd7aecb5f4b1707d9ec927137 Gerrit-Change-Number: 37881 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Aug 2024 23:55:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 0

2026

2025

2024

2023

2022

gerrit-log