- gerrit-log - lists.osmocom.org

[S] Change in libosmo-sigtran[master]: sccp: Implement dpc_accessible()

by pespin

Attention is currently required from: daniel, fixeria, laforge, neels, osmith. Hello Jenkins Builder, daniel, fixeria, laforge, neels, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: sccp: Implement dpc_accessible() ...................................................................... sccp: Implement dpc_accessible() Change-Id: I16b0aa71db5be2daf7a8c52da829a38ad564eb7b --- M src/sccp_scrc.c 1 file changed, 29 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/50/40250/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I16b0aa71db5be2daf7a8c52da829a38ad564eb7b Gerrit-Change-Number: 40250 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: kpi: count RAB actions received in unexpected state

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40280?usp=email ) Change subject: kpi: count RAB actions received in unexpected state ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40280?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: If3521ba601b9d7448226f2303ed2ef402d861bef Gerrit-Change-Number: 40280 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 13:05:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[XS] Change in osmo-hnbgw[master]: kpi: Fix wrong counters incremented in RAB Release Failed List

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40279?usp=email ) Change subject: kpi: Fix wrong counters incremented in RAB Release Failed List ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40279?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: I0bcb70ca18078bb9201ce6cbf4ea81c05ae4ea68 Gerrit-Change-Number: 40279 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 13:03:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: kpi: Increment counters using enum field explicitly

by osmith

Attention is currently required from: fixeria, laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40278?usp=email ) Change subject: kpi: Increment counters using enum field explicitly ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40278?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: I126973b93e86784adaccbcba49c6322c261f4746 Gerrit-Change-Number: 40278 Gerrit-PatchSet: 5 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 13:02:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: kpi: count RAB actions received in unexpected state

by pespin

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40280?usp=email ) Change subject: kpi: count RAB actions received in unexpected state ...................................................................... kpi: count RAB actions received in unexpected state This allows figuring out that something may be wrong in the network, with both sides (HNB vs CN) going out of sync, or HNBGW ending up in a bad state due to eg. a bug where a RAB is lost. While at it, fix some formatting issues on related counters. Related: SYS#7455 Change-Id: If3521ba601b9d7448226f2303ed2ef402d861bef --- M include/osmocom/hnbgw/hnb_persistent.h M src/osmo-hnbgw/hnb_persistent.c M src/osmo-hnbgw/kpi_ranap.c 3 files changed, 66 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/80/40280/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40280?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: If3521ba601b9d7448226f2303ed2ef402d861bef Gerrit-Change-Number: 40280 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: kpi: Increment counters using enum field explicitly

by pespin

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40278?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: kpi: Increment counters using enum field explicitly ...................................................................... kpi: Increment counters using enum field explicitly I was first tricked by the increment of ctr_num. This is wrong for several reasons: * Assumes one counter will always be immediatelly after the other, and there's no static assert about that. * Makes it difficult to grep for users of the counter in the code. Change-Id: I126973b93e86784adaccbcba49c6322c261f4746 --- M src/osmo-hnbgw/kpi_ranap.c 1 file changed, 8 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/78/40278/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40278?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: I126973b93e86784adaccbcba49c6322c261f4746 Gerrit-Change-Number: 40278 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: WIP: count RAB actions received in unexpected state

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40280?usp=email ) Change subject: WIP: count RAB actions received in unexpected state ...................................................................... WIP: count RAB actions received in unexpected state This allows figuring out that something may be wrong in the network, with both sides (HNB vs CN) going out of sync, or HNBGW ending up in a bad state due to eg. a bug where a RAB is lost. While at it, fix some formatting issues on related counters. Change-Id: If3521ba601b9d7448226f2303ed2ef402d861bef --- M include/osmocom/hnbgw/hnb_persistent.h M src/osmo-hnbgw/hnb_persistent.c M src/osmo-hnbgw/kpi_ranap.c 3 files changed, 66 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/80/40280/1 diff --git a/include/osmocom/hnbgw/hnb_persistent.h b/include/osmocom/hnbgw/hnb_persistent.h index c4379de..07c017b 100644 --- a/include/osmocom/hnbgw/hnb_persistent.h +++ b/include/osmocom/hnbgw/hnb_persistent.h @@ -39,12 +39,18 @@ HNB_CTR_RANAP_PS_RAB_ACT_REQ, HNB_CTR_RANAP_CS_RAB_ACT_REQ, + HNB_CTR_RANAP_PS_RAB_ACT_REQ_UNEXP, + HNB_CTR_RANAP_CS_RAB_ACT_REQ_UNEXP, HNB_CTR_RANAP_PS_RAB_ACT_CNF, HNB_CTR_RANAP_CS_RAB_ACT_CNF, + HNB_CTR_RANAP_PS_RAB_ACT_CNF_UNEXP, + HNB_CTR_RANAP_CS_RAB_ACT_CNF_UNEXP, HNB_CTR_RANAP_PS_RAB_ACT_FAIL, HNB_CTR_RANAP_CS_RAB_ACT_FAIL, + HNB_CTR_RANAP_PS_RAB_ACT_FAIL_UNEXP, + HNB_CTR_RANAP_CS_RAB_ACT_FAIL_UNEXP, HNB_CTR_RANAP_PS_RAB_MOD_REQ, HNB_CTR_RANAP_CS_RAB_MOD_REQ, @@ -59,12 +65,18 @@ HNB_CTR_RANAP_CS_RAB_REL_REQ, HNB_CTR_RANAP_PS_RAB_REL_REQ_ABNORMAL, HNB_CTR_RANAP_CS_RAB_REL_REQ_ABNORMAL, + HNB_CTR_RANAP_PS_RAB_REL_REQ_UNEXP, + HNB_CTR_RANAP_CS_RAB_REL_REQ_UNEXP, HNB_CTR_RANAP_PS_RAB_REL_CNF, HNB_CTR_RANAP_CS_RAB_REL_CNF, + HNB_CTR_RANAP_PS_RAB_REL_CNF_UNEXP, + HNB_CTR_RANAP_CS_RAB_REL_CNF_UNEXP, HNB_CTR_RANAP_PS_RAB_REL_FAIL, HNB_CTR_RANAP_CS_RAB_REL_FAIL, + HNB_CTR_RANAP_PS_RAB_REL_FAIL_UNEXP, + HNB_CTR_RANAP_CS_RAB_REL_FAIL_UNEXP, HNB_CTR_RANAP_PS_RAB_REL_IMPLICIT, HNB_CTR_RANAP_CS_RAB_REL_IMPLICIT, diff --git a/src/osmo-hnbgw/hnb_persistent.c b/src/osmo-hnbgw/hnb_persistent.c index bcd6c4b..015e7c6 100644 --- a/src/osmo-hnbgw/hnb_persistent.c +++ b/src/osmo-hnbgw/hnb_persistent.c @@ -63,16 +63,28 @@ "ranap:ps:rab_act:req", "PS RAB Activations requested" }, [HNB_CTR_RANAP_CS_RAB_ACT_REQ] = { "ranap:cs:rab_act:req", "CS RAB Activations requested" }, + [HNB_CTR_RANAP_PS_RAB_ACT_REQ_UNEXP] = { + "ranap:ps:rab_act:req_unexp", "PS RAB Activations requested in unexpected state" }, + [HNB_CTR_RANAP_CS_RAB_ACT_REQ_UNEXP] = { + "ranap:cs:rab_act:req_unexp", "CS RAB Activations requested in unexpected state" }, [HNB_CTR_RANAP_PS_RAB_ACT_CNF] = { "ranap:ps:rab_act:cnf", "PS RAB Activations confirmed" }, [HNB_CTR_RANAP_CS_RAB_ACT_CNF] = { "ranap:cs:rab_act:cnf", "CS RAB Activations confirmed" }, + [HNB_CTR_RANAP_PS_RAB_ACT_CNF_UNEXP] = { + "ranap:ps:rab_act:cnf_unexp", "PS RAB Activations confirmed in unexpected state" }, + [HNB_CTR_RANAP_CS_RAB_ACT_CNF_UNEXP] = { + "ranap:cs:rab_act:cnf_unexp", "CS RAB Activations confirmed in unexpected state" }, [HNB_CTR_RANAP_PS_RAB_ACT_FAIL] = { "ranap:ps:rab_act:fail", "PS RAB Activations failed" }, [HNB_CTR_RANAP_CS_RAB_ACT_FAIL] = { "ranap:cs:rab_act:fail", "CS RAB Activations failed" }, + [HNB_CTR_RANAP_PS_RAB_ACT_FAIL_UNEXP] = { + "ranap:ps:rab_act:fail_unexp", "PS RAB Activations failed in unexpected state" }, + [HNB_CTR_RANAP_CS_RAB_ACT_FAIL_UNEXP] = { + "ranap:cs:rab_act:fail_unexp", "CS RAB Activations failed in unexpected state" }, [HNB_CTR_RANAP_PS_RAB_MOD_REQ] = { @@ -98,16 +110,28 @@ "ranap:ps:rab_rel:req:abnormal", "PS RAB Release requested (by CN), abnormal" }, [HNB_CTR_RANAP_CS_RAB_REL_REQ_ABNORMAL] = { "ranap:cs:rab_rel:req:abnormal", "CS RAB Release requested (by CN), abnormal" }, + [HNB_CTR_RANAP_PS_RAB_REL_REQ_UNEXP] = { + "ranap:ps:rab_rel:req:unexp", "PS RAB Release requested (by CN) in unexpected state" }, + [HNB_CTR_RANAP_CS_RAB_REL_REQ_UNEXP] = { + "ranap:cs:rab_rel:req:unexp", "CS RAB Release requested (by CN) in unexpected state" }, [HNB_CTR_RANAP_PS_RAB_REL_CNF] = { "ranap:ps:rab_rel:cnf", "PS RAB Release confirmed" }, [HNB_CTR_RANAP_CS_RAB_REL_CNF] = { "ranap:cs:rab_rel:cnf", "CS RAB Release confirmed" }, + [HNB_CTR_RANAP_PS_RAB_REL_CNF_UNEXP] = { + "ranap:ps:rab_rel:cnf_unexp", "PS RAB Release confirmed in unexpected state" }, + [HNB_CTR_RANAP_CS_RAB_REL_CNF_UNEXP] = { + "ranap:cs:rab_rel:cnf_unexp", "CS RAB Release confirmed in unexpected state" }, [HNB_CTR_RANAP_PS_RAB_REL_FAIL] = { "ranap:ps:rab_rel:fail", "PS RAB Release failed" }, [HNB_CTR_RANAP_CS_RAB_REL_FAIL] = { "ranap:cs:rab_rel:fail", "CS RAB Release failed" }, + [HNB_CTR_RANAP_PS_RAB_REL_FAIL_UNEXP] = { + "ranap:ps:rab_rel:fail_unexp", "PS RAB Release failed in unexpected state" }, + [HNB_CTR_RANAP_CS_RAB_REL_FAIL_UNEXP] = { + "ranap:cs:rab_rel:fail_unexp", "CS RAB Release failed in unexpected state" }, [HNB_CTR_RANAP_PS_RAB_REL_IMPLICIT] = { "ranap:ps:rab_rel:implicit:normal", "PS RAB Release implicit (during Iu Release), normal" }, diff --git a/src/osmo-hnbgw/kpi_ranap.c b/src/osmo-hnbgw/kpi_ranap.c index cbaa61d..865e2b4 100644 --- a/src/osmo-hnbgw/kpi_ranap.c +++ b/src/osmo-hnbgw/kpi_ranap.c @@ -106,13 +106,17 @@ * new, it is a setup */ switch (map->rab_state[rab_id]) { case RAB_STATE_ACTIVE: - HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_MOD_REQ : HNB_CTR_RANAP_CS_RAB_MOD_REQ); + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_MOD_REQ : + HNB_CTR_RANAP_CS_RAB_MOD_REQ); break; case RAB_STATE_INACTIVE: - HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_REQ : HNB_CTR_RANAP_CS_RAB_ACT_REQ); + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_REQ : + HNB_CTR_RANAP_CS_RAB_ACT_REQ); map->rab_state[rab_id] = RAB_STATE_ACT_REQ; break; default: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_REQ_UNEXP : + HNB_CTR_RANAP_CS_RAB_ACT_REQ_UNEXP); LOG_MAP(map, DRANAP, LOGL_NOTICE, "Unexpected RAB Activation/Modification Req for RAB in state %s\n", hnbgw_rab_state_name(map->rab_state[rab_id])); @@ -158,6 +162,8 @@ } break; default: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_REQ_UNEXP : + HNB_CTR_RANAP_CS_RAB_REL_REQ_UNEXP); LOG_MAP(map, DRANAP, LOGL_NOTICE, "Unexpected RAB Release Req in state %s\n", hnbgw_rab_state_name(map->rab_state[rab_id])); @@ -247,13 +253,17 @@ /* differentiate modify / activate */ switch (map->rab_state[rab_id]) { case RAB_STATE_ACT_REQ: - HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_CNF : HNB_CTR_RANAP_CS_RAB_ACT_CNF); + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_CNF : + HNB_CTR_RANAP_CS_RAB_ACT_CNF); map->rab_state[rab_id] = RAB_STATE_ACTIVE; break; case RAB_STATE_ACTIVE: - HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_MOD_CNF : HNB_CTR_RANAP_CS_RAB_MOD_CNF); + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_MOD_CNF : + HNB_CTR_RANAP_CS_RAB_MOD_CNF); break; default: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_CNF_UNEXP : + HNB_CTR_RANAP_CS_RAB_ACT_CNF_UNEXP); LOG_MAP(map, DRANAP, LOGL_NOTICE, "Unexpected RAB Activation/Modification Conf for RAB in state %s\n", hnbgw_rab_state_name(map->rab_state[rab_id])); @@ -267,8 +277,6 @@ if (ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_RELEASEDLIST_PRESENT) { RANAP_RAB_ReleasedList_t *r_list = &ies->raB_ReleasedList; /* increment number of released RABs, we don't need to do that individually during iteration */ - HNBP_CTR_ADD(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_CNF : HNB_CTR_RANAP_CS_RAB_REL_CNF, - r_list->raB_ReleasedList_ies.list.count); for (unsigned int i = 0; i < r_list->raB_ReleasedList_ies.list.count; i++) { RANAP_IE_t *released_list_ie = r_list->raB_ReleasedList_ies.list.array[i]; RANAP_RAB_ReleasedItemIEs_t _rab_rel_item_ies = {}; @@ -292,8 +300,12 @@ switch (map->rab_state[rab_id]) { case RAB_STATE_REL_REQ: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_CNF : + HNB_CTR_RANAP_CS_RAB_REL_CNF); break; default: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_CNF_UNEXP : + HNB_CTR_RANAP_CS_RAB_REL_CNF_UNEXP); LOG_MAP(map, DRANAP, LOGL_NOTICE, "Unexpected RAB Release Conf for RAB in state %s\n", hnbgw_rab_state_name(map->rab_state[rab_id])); @@ -335,14 +347,18 @@ /* differentiate modify / activate */ switch (map->rab_state[rab_id]) { case RAB_STATE_ACT_REQ: - HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_FAIL : HNB_CTR_RANAP_CS_RAB_ACT_FAIL); + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_FAIL : + HNB_CTR_RANAP_CS_RAB_ACT_FAIL); map->rab_state[rab_id] = RAB_STATE_INACTIVE; break; case RAB_STATE_ACTIVE: - HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_MOD_FAIL : HNB_CTR_RANAP_CS_RAB_MOD_FAIL); + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_MOD_FAIL : + HNB_CTR_RANAP_CS_RAB_MOD_FAIL); // FIXME: does it remain active after modification failure? break; default: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_FAIL_UNEXP : + HNB_CTR_RANAP_CS_RAB_ACT_FAIL_UNEXP); LOG_MAP(map, DRANAP, LOGL_NOTICE, "Unexpected RAB Activation/Modification Failed for RAB in state %s\n", hnbgw_rab_state_name(map->rab_state[rab_id])); @@ -356,8 +372,6 @@ if (ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_RELEASEFAILEDLIST_PRESENT) { RANAP_RAB_ReleaseFailedList_t *rf_list = &ies->raB_ReleaseFailedList; /* increment number of released RABs, we don't need to do that individually during iteration */ - HNBP_CTR_ADD(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_FAIL : HNB_CTR_RANAP_CS_RAB_REL_FAIL, - rf_list->raB_FailedList_ies.list.count); for (unsigned int i = 0; i < rf_list->raB_FailedList_ies.list.count; i++) { RANAP_IE_t *failed_list_ie = rf_list->raB_FailedList_ies.list.array[i]; RANAP_RAB_FailedItemIEs_t _rab_failed_item_ies = {}; @@ -382,12 +396,18 @@ /* differentiate modify / activate */ switch (map->rab_state[rab_id]) { case RAB_STATE_ACT_REQ: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_FAIL : + HNB_CTR_RANAP_CS_RAB_REL_FAIL); map->rab_state[rab_id] = RAB_STATE_INACTIVE; break; case RAB_STATE_ACTIVE: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_FAIL : + HNB_CTR_RANAP_CS_RAB_REL_FAIL); // FIXME: does it remain active after modification failure? break; default: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_FAIL_UNEXP : + HNB_CTR_RANAP_CS_RAB_REL_FAIL_UNEXP); LOG_MAP(map, DRANAP, LOGL_NOTICE, "Unexpected RAB Release Failed for RAB in state %s\n", hnbgw_rab_state_name(map->rab_state[rab_id])); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40280?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If3521ba601b9d7448226f2303ed2ef402d861bef Gerrit-Change-Number: 40280 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[XS] Change in osmo-hnbgw[master]: kpi: Fix wrong counters incremented in RAB Release Failed List

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40279?usp=email ) Change subject: kpi: Fix wrong counters incremented in RAB Release Failed List ...................................................................... kpi: Fix wrong counters incremented in RAB Release Failed List Thouse counters are already incremented somewhere else, when Setup-or-modify is answered with a failure. This list is for RABs which failed to release, and the correct counter is already being incremented above. Change-Id: I0bcb70ca18078bb9201ce6cbf4ea81c05ae4ea68 --- M src/osmo-hnbgw/kpi_ranap.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/79/40279/1 diff --git a/src/osmo-hnbgw/kpi_ranap.c b/src/osmo-hnbgw/kpi_ranap.c index 640f838..cbaa61d 100644 --- a/src/osmo-hnbgw/kpi_ranap.c +++ b/src/osmo-hnbgw/kpi_ranap.c @@ -382,11 +382,9 @@ /* differentiate modify / activate */ switch (map->rab_state[rab_id]) { case RAB_STATE_ACT_REQ: - HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_FAIL : HNB_CTR_RANAP_CS_RAB_ACT_FAIL); map->rab_state[rab_id] = RAB_STATE_INACTIVE; break; case RAB_STATE_ACTIVE: - HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_MOD_FAIL : HNB_CTR_RANAP_CS_RAB_MOD_FAIL); // FIXME: does it remain active after modification failure? break; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40279?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I0bcb70ca18078bb9201ce6cbf4ea81c05ae4ea68 Gerrit-Change-Number: 40279 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[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, 3 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, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log