pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/41456?usp=email )
Change subject: bssgp: Fix non-uniqe rate_ctr ids
......................................................................
bssgp: Fix non-uniqe rate_ctr ids
Fixes following error:
"""
counter group 'bssgp:bss_ctx' already exists for index 0, instead using index
211. This is a software bug that needs fixing. (rate_ctr.c:221)
"""
Related: SYS#7125
Change-Id: I782e11a75a8adc10292238fde46bf9c3975d970d
---
M src/gb/gprs_bssgp.c
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
daniel: Looks good to me, but someone else must approve
diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c
index d436f0a..e73e94c 100644
--- a/src/gb/gprs_bssgp.c
+++ b/src/gb/gprs_bssgp.c
@@ -216,8 +216,7 @@
ctx->bvci = bvci;
ctx->nsei = nsei;
ctx->is_sgsn = true;
- /* FIXME: BVCI is not unique, only BVCI+NSEI ?!? */
- ctx->ctrg = rate_ctr_group_alloc(ctx, &bssgp_ctrg_desc, bvci);
+ ctx->ctrg = rate_ctr_group_alloc(ctx, &bssgp_ctrg_desc, ((uint32_t)nsei
<< 16) | bvci);
if (!ctx->ctrg)
goto err_ctrg;
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41456?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I782e11a75a8adc10292238fde46bf9c3975d970d
Gerrit-Change-Number: 41456
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <[email protected]>
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: lynxis lazus <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
