May 2025 - gerrit-log - lists.osmocom.org

[S] Change in osmo-hnbgw[master]: Clean up calls to ps_rab_ass_fsm_state_chg()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40274?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Clean up calls to ps_rab_ass_fsm_state_chg() ...................................................................... Clean up calls to ps_rab_ass_fsm_state_chg() Change-Id: I7c9a67ebe192ba30fa474f84eaee1db2a718fa35 --- M src/osmo-hnbgw/ps_rab_ass_fsm.c 1 file changed, 3 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/src/osmo-hnbgw/ps_rab_ass_fsm.c b/src/osmo-hnbgw/ps_rab_ass_fsm.c index f76b1cf..68bf58a 100644 --- a/src/osmo-hnbgw/ps_rab_ass_fsm.c +++ b/src/osmo-hnbgw/ps_rab_ass_fsm.c @@ -118,7 +118,7 @@ /* PS_RAB_ASS_ST_WAIT_RABS_ESTABLISHED is terminated by PFCP timeouts via ps_rab_fsm */ }; -#define ps_rab_ass_fsm_state_chg(state) \ +#define ps_rab_ass_fsm_state_chg(fi, state) \ osmo_tdef_fsm_inst_state_chg(fi, state, ps_rab_ass_fsm_timeouts, hnbgw_T_defs, -1) static struct osmo_fsm ps_rab_ass_fsm; @@ -219,12 +219,9 @@ { RANAP_RAB_AssignmentRequestIEs_t *ies = &message->msg.raB_AssignmentRequestIEs; int i; - struct ps_rab_ass *rab_ass; - struct osmo_fsm_inst *fi; rab_ass = ps_rab_ass_alloc(map); - talloc_steal(rab_ass, message); rab_ass->ranap_rab_ass_req_message = message; /* Now rab_ass owns message and will clean it up */ @@ -258,8 +255,7 @@ /* Got all RABs' state and their Core side GTP info in map->ps_rab_list. For each, a ps_rab_fsm has been started and * each will call back with PS_RAB_ASS_EV_LOCAL_F_TEIDS_RX or PS_RAB_ASS_EV_RAB_FAIL. */ - fi = rab_ass->fi; - return ps_rab_ass_fsm_state_chg(PS_RAB_ASS_ST_WAIT_LOCAL_F_TEIDS); + return ps_rab_ass_fsm_state_chg(rab_ass->fi, PS_RAB_ASS_ST_WAIT_LOCAL_F_TEIDS); no_rab: ps_rab_ass_failure(rab_ass); @@ -416,7 +412,6 @@ int rc; int i; struct ps_rab_ass *rab_ass; - struct osmo_fsm_inst *fi; RANAP_RAB_AssignmentResponseIEs_t *ies; /* Make sure we indeed deal with a setup-or-modify list */ @@ -472,8 +467,7 @@ /* Got all RABs' state and updated their Access side GTP info in map->ps_rab_list. For each RAB ID, the matching * ps_rab_fsm has been instructed to tell the UPF about the Access Remote GTP F-TEID. Each will call back with * PS_RAB_ASS_EV_RAB_ESTABLISHED or PS_RAB_ASS_EV_RAB_FAIL. */ - fi = rab_ass->fi; - return ps_rab_ass_fsm_state_chg(PS_RAB_ASS_ST_WAIT_RABS_ESTABLISHED); + return ps_rab_ass_fsm_state_chg(rab_ass->fi, PS_RAB_ASS_ST_WAIT_RABS_ESTABLISHED); } static void ps_rab_ass_resp_send_if_ready(struct ps_rab_ass *rab_ass); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40274?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: I7c9a67ebe192ba30fa474f84eaee1db2a718fa35 Gerrit-Change-Number: 40274 Gerrit-PatchSet: 3 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, 2 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: vty: Allow setting cnlink msc/sgsn name

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40270?usp=email ) Change subject: vty: Allow setting cnlink msc/sgsn name ...................................................................... vty: Allow setting cnlink msc/sgsn name This is useful to identify each individual CN link towards a specific MSC/SGSN, be it checking VTY config, looking at logs, reporting over statsd, etc. Change-Id: Ic557f20f40fec49ce2c83a73f6e5c8b027d57ef5 --- M include/osmocom/hnbgw/cnlink.h M src/osmo-hnbgw/cnlink.c M src/osmo-hnbgw/hnbgw_vty.c M tests/cnpool.vty 4 files changed, 58 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/hnbgw/cnlink.h b/include/osmocom/hnbgw/cnlink.h index ee1a8dd..1d413a9 100644 --- a/include/osmocom/hnbgw/cnlink.h +++ b/include/osmocom/hnbgw/cnlink.h @@ -104,6 +104,7 @@ struct hnbgw_cnlink *hnbgw_cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr); void hnbgw_cnlink_term_and_free(struct hnbgw_cnlink *cnlink); void hnbgw_cnlink_drop_sccp(struct hnbgw_cnlink *cnlink); +int hnbgw_cnlink_set_name(struct hnbgw_cnlink *cnlink, const char *name); int hnbgw_cnlink_tx_ranap_reset(struct hnbgw_cnlink *cnlink); int hnbgw_cnlink_tx_ranap_reset_ack(struct hnbgw_cnlink *cnlink); diff --git a/src/osmo-hnbgw/cnlink.c b/src/osmo-hnbgw/cnlink.c index 8d312c6..0bd2b3d 100644 --- a/src/osmo-hnbgw/cnlink.c +++ b/src/osmo-hnbgw/cnlink.c @@ -230,6 +230,17 @@ return cnlink; } +int hnbgw_cnlink_set_name(struct hnbgw_cnlink *cnlink, const char *name) +{ + talloc_free(cnlink->name); + cnlink->name = talloc_strdup(cnlink, name); + osmo_fsm_inst_update_id_f_sanitize(cnlink->fi, '-', cnlink->name); + /* Update rate_ctr/stats to report by name instead of index: */ + rate_ctr_group_set_name(cnlink->ctrs, cnlink->name); + osmo_stat_item_group_set_name(cnlink->statg, cnlink->name); + return 0; +} + void hnbgw_cnlink_drop_sccp(struct hnbgw_cnlink *cnlink) { struct hnbgw_context_map *map, *map2; diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index 52c5ba6..7d78909 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -149,7 +149,8 @@ return; } - vty_out(vty, "%s <->", + vty_out(vty, "%s: %s <->", + cnlink->name, osmo_sccp_user_name(cnlink->hnbgw_sccp_user->sccp_user)); vty_out(vty, " %s%s%s%s", cnlink->use.remote_addr_name ? : "", @@ -526,6 +527,18 @@ /* 'msc 0' / 'remote-addr my-msc' and * 'sgsn 0' / 'remote-addr my-sgsn' */ +DEFUN(cfg_cnlink_name, + cfg_cnlink_name_cmd, + "name NAME", + "Set user defined name for this msc/sgsn\n" + "The user defined name to be set for this msc/sgsn\n") +{ + struct hnbgw_cnlink *cnlink = vty->index; + if (hnbgw_cnlink_set_name(cnlink, argv[0]) < 0) + return CMD_WARNING; + return CMD_SUCCESS; +} + DEFUN(cfg_cnlink_remote_addr, cfg_cnlink_remote_addr_cmd, "remote-addr NAME", @@ -1057,6 +1070,7 @@ llist_for_each_entry(cnlink, &cnpool->cnlinks, entry) { vty_out(vty, "%s %d%s", cnpool->peer_name, cnlink->nr, VTY_NEWLINE); + vty_out(vty, " name %s%s", cnlink->name, VTY_NEWLINE); if (cnlink->vty.remote_addr_name) vty_out(vty, " remote-addr %s%s", cnlink->vty.remote_addr_name, VTY_NEWLINE); cnlink_write_nri(vty, cnlink, false); @@ -1098,6 +1112,7 @@ static void install_cnlink_elements(int node) { + install_element(node, &cfg_cnlink_name_cmd); install_element(node, &cfg_cnlink_remote_addr_cmd); install_element(node, &cfg_cnlink_nri_add_cmd); install_element(node, &cfg_cnlink_nri_del_cmd); diff --git a/tests/cnpool.vty b/tests/cnpool.vty index 2de56a7..78f660f 100644 --- a/tests/cnpool.vty +++ b/tests/cnpool.vty @@ -135,7 +135,9 @@ OsmoHNBGW(config)# show running-config ... msc 0 + name msc-0 sgsn 0 + name sgsn-0 ... OsmoHNBGW(config)# msc 1 @@ -224,9 +226,13 @@ OsmoHNBGW(config)# show running-config ... msc 0 + name msc-0 msc 1 + name msc-1 sgsn 0 + name sgsn-0 sgsn 1 + name sgsn-1 ... OsmoHNBGW(config)# ### Add {msc,sgsn}x{2,3} @@ -252,18 +258,26 @@ OsmoHNBGW(config)# show running-config ... msc 0 + name msc-0 msc 1 + name msc-1 msc 2 + name msc-2 remote-addr addr-msc2 no allow-attach msc 3 + name msc-3 remote-addr addr-msc3 allow-emergency sgsn 0 + name sgsn-0 sgsn 1 + name sgsn-1 sgsn 2 + name sgsn-2 remote-addr addr-sgsn2 sgsn 3 + name sgsn-3 remote-addr addr-sgsn3 ... @@ -282,16 +296,24 @@ OsmoHNBGW(config)# show running-config ... msc 0 + name msc-0 msc 1 + name msc-1 msc 2 + name msc-2 remote-addr addr-msc2 msc 3 + name msc-3 remote-addr addr-msc4 sgsn 0 + name sgsn-0 sgsn 1 + name sgsn-1 sgsn 2 + name sgsn-2 remote-addr addr-sgsn4 sgsn 3 + name sgsn-3 remote-addr addr-sgsn3 ... @@ -321,18 +343,26 @@ hnbgw ... msc 0 + name msc-0 remote-addr addr-msc0 msc 1 + name msc-1 msc 2 + name msc-2 remote-addr addr-msc2 msc 3 + name msc-3 remote-addr addr-msc4 sgsn 0 + name sgsn-0 remote-addr addr-sgsn0 sgsn 1 + name sgsn-1 sgsn 2 + name sgsn-2 remote-addr addr-sgsn4 sgsn 3 + name sgsn-3 remote-addr addr-sgsn3 ... -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40270?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: Ic557f20f40fec49ce2c83a73f6e5c8b027d57ef5 Gerrit-Change-Number: 40270 Gerrit-PatchSet: 3 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: context_map: Rename ps_rab(_ass) to denote it is a list

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40273?usp=email ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: context_map: Rename ps_rab(_ass) to denote it is a list ...................................................................... context_map: Rename ps_rab(_ass) to denote it is a list This allows also easily grepping to figure out where it is used, otherwise it was named like the struct, fsm, etc. Change-Id: I6ac029e6a820a031a443dae8c83e44f6ae9fb5fa --- M include/osmocom/hnbgw/context_map.h M src/osmo-hnbgw/context_map.c M src/osmo-hnbgw/ps_rab_ass_fsm.c M src/osmo-hnbgw/ps_rab_fsm.c 4 files changed, 20 insertions(+), 20 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/include/osmocom/hnbgw/context_map.h b/include/osmocom/hnbgw/context_map.h index a885f5b..55743ed 100644 --- a/include/osmocom/hnbgw/context_map.h +++ b/include/osmocom/hnbgw/context_map.h @@ -200,15 +200,15 @@ * and Request and Response don't necessarily match the RAB IDs contained. In practice I only ever see a single * RAB matching in Request and Response, but we cannot rely on that to always be true. * - * The state of each RAB's PFCP negotiation is kept separately in the list ps_rabs, and as soon as all RABs + * The state of each RAB's PFCP negotiation is kept separately in the field ps_rab_list, and as soon as all RABs * appearing in a PS RAB Assignment message have completed their PFCP setup, we can replace the GTP info for the * RAB IDs and forward the RAB Assignment Request to HNB / the RAB Assignment Response to CN. */ - struct llist_head ps_rab_ass; + struct llist_head ps_rab_ass_list; /* All PS RABs and their GTP tunnel mappings. list of struct ps_rab. Each ps_rab FSM handles the PFCP * communication for one particular RAB ID. */ - struct llist_head ps_rabs; + struct llist_head ps_rab_list; /* RAB state tracking. As RAB-ID is an 8-bit integer, we need 256 elements in the array */ uint8_t rab_state[256]; diff --git a/src/osmo-hnbgw/context_map.c b/src/osmo-hnbgw/context_map.c index cc68ec6..a70905c 100644 --- a/src/osmo-hnbgw/context_map.c +++ b/src/osmo-hnbgw/context_map.c @@ -88,8 +88,8 @@ map->hnb_ctx = hnb; map->rua_ctx_id = rua_ctx_id; map->is_ps = is_ps; - INIT_LLIST_HEAD(&map->ps_rab_ass); - INIT_LLIST_HEAD(&map->ps_rabs); + INIT_LLIST_HEAD(&map->ps_rab_ass_list); + INIT_LLIST_HEAD(&map->ps_rab_list); map_rua_fsm_alloc(map); diff --git a/src/osmo-hnbgw/ps_rab_ass_fsm.c b/src/osmo-hnbgw/ps_rab_ass_fsm.c index f5025a2..f76b1cf 100644 --- a/src/osmo-hnbgw/ps_rab_ass_fsm.c +++ b/src/osmo-hnbgw/ps_rab_ass_fsm.c @@ -81,10 +81,10 @@ * This structure manages the RAB Assignment procedures, and the currently set up RABs: * * - hnbgw_context_map - * - .ps_rab_ass: list of PS RAB Assignment procedures + * - .ps_rab_ass_list: list of PS RAB Assignment procedures * - ps_rab_ass_fsm: one RANAP PS RAB Assignment procedure * - ... - * - .ps_rabs: list of individual PS RABs + * - .ps_rab_list: list of individual PS RABs * - ps_rab_fsm: one GTP mapping with PFCP session to the UPF, for a single RAB * - ... * @@ -140,7 +140,7 @@ }; fi->priv = rab_ass; - llist_add_tail(&rab_ass->entry, &map->ps_rab_ass); + llist_add_tail(&rab_ass->entry, &map->ps_rab_ass_list); return rab_ass; } @@ -240,7 +240,7 @@ goto no_rab; } - /* Multiple RABs may be set up, assemble in list rab_ass->ps_rabs. */ + /* Multiple RABs may be set up, assemble in list map->ps_rab_list. */ for (i = 0; i < ies->raB_SetupOrModifyList.list.count; i++) { RANAP_ProtocolIE_ContainerPair_t *protocol_ie_container_pair; RANAP_ProtocolIE_FieldPair_t *protocol_ie_field_pair; @@ -256,7 +256,7 @@ goto no_rab; } - /* Got all RABs' state and their Core side GTP info in map->ps_rabs. For each, a ps_rab_fsm has been started and + /* Got all RABs' state and their Core side GTP info in map->ps_rab_list. For each, a ps_rab_fsm has been started and * each will call back with PS_RAB_ASS_EV_LOCAL_F_TEIDS_RX or PS_RAB_ASS_EV_RAB_FAIL. */ fi = rab_ass->fi; return ps_rab_ass_fsm_state_chg(PS_RAB_ASS_ST_WAIT_LOCAL_F_TEIDS); @@ -443,7 +443,7 @@ LOG_PS_RAB_ASS(rab_ass, LOGL_INFO, "PS RAB-AssignmentResponse received, updating RABs\n"); - /* Multiple RABs may be set up, bump matching FSMs in list rab_ass->ps_rabs. */ + /* Multiple RABs may be set up, bump matching FSMs in list map->ps_rab_list. */ for (i = 0; i < ies->raB_SetupOrModifiedList.raB_SetupOrModifiedList_ies.list.count; i++) { RANAP_IE_t *list_ie; RANAP_RAB_SetupOrModifiedItemIEs_t item_ies; @@ -469,7 +469,7 @@ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifiedItem, &item_ies); } - /* Got all RABs' state and updated their Access side GTP info in map->ps_rabs. For each RAB ID, the matching + /* Got all RABs' state and updated their Access side GTP info in map->ps_rab_list. For each RAB ID, the matching * ps_rab_fsm has been instructed to tell the UPF about the Access Remote GTP F-TEID. Each will call back with * PS_RAB_ASS_EV_RAB_ESTABLISHED or PS_RAB_ASS_EV_RAB_FAIL. */ fi = rab_ass->fi; @@ -618,14 +618,14 @@ struct ps_rab_ass *rab_ass = fi->priv; struct ps_rab *rab; - llist_for_each_entry(rab, &rab_ass->map->ps_rabs, entry) { + llist_for_each_entry(rab, &rab_ass->map->ps_rab_list, entry) { if (rab->req_fi == fi) rab->req_fi = NULL; if (rab->resp_fi == fi) rab->resp_fi = NULL; } - /* remove from map->ps_rab_ass */ + /* remove from map->ps_rab_ass_list */ llist_del(&rab_ass->entry); } @@ -633,10 +633,10 @@ { struct ps_rab_ass *rab_ass, *next; struct ps_rab *rab, *next2; - llist_for_each_entry_safe(rab, next2, &map->ps_rabs, entry) { + llist_for_each_entry_safe(rab, next2, &map->ps_rab_list, entry) { ps_rab_release(rab); } - llist_for_each_entry_safe(rab_ass, next, &map->ps_rab_ass, entry) { + llist_for_each_entry_safe(rab_ass, next, &map->ps_rab_ass_list, entry) { osmo_fsm_inst_term(rab_ass->fi, OSMO_FSM_TERM_REGULAR, NULL); } } diff --git a/src/osmo-hnbgw/ps_rab_fsm.c b/src/osmo-hnbgw/ps_rab_fsm.c index f6d113d..6c9c429 100644 --- a/src/osmo-hnbgw/ps_rab_fsm.c +++ b/src/osmo-hnbgw/ps_rab_fsm.c @@ -107,7 +107,7 @@ OSMO_ASSERT(osmo_use_count_get_put(&rab->use_count, PS_RAB_USE_ACTIVE, 1) == 0); - llist_add_tail(&rab->entry, &map->ps_rabs); + llist_add_tail(&rab->entry, &map->ps_rab_list); return rab; } @@ -121,7 +121,7 @@ struct hnbgw_context_map *map; llist_for_each_entry(map, &hnb->map_list, hnb_list) { struct ps_rab *rab; - llist_for_each_entry(rab, &map->ps_rabs, entry) { + llist_for_each_entry(rab, &map->ps_rab_list, entry) { uint64_t rab_seid = is_cp_seid ? rab->cp_seid : rab->up_f_seid.seid; if (rab_seid == seid) return rab; @@ -154,7 +154,7 @@ struct ps_rab *ps_rab_get(struct hnbgw_context_map *map, uint8_t rab_id) { struct ps_rab *rab; - llist_for_each_entry(rab, &map->ps_rabs, entry) { + llist_for_each_entry(rab, &map->ps_rab_list, entry) { if (rab->rab_id != rab_id) continue; return rab; @@ -692,7 +692,7 @@ static void ps_rab_forget_map(struct ps_rab *rab) { - /* remove from map->ps_rabs */ + /* remove from map->ps_rab_list */ if (rab->map) llist_del(&rab->entry); rab->map = NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40273?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: I6ac029e6a820a031a443dae8c83e44f6ae9fb5fa Gerrit-Change-Number: 40273 Gerrit-PatchSet: 5 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, 2 weeks

1
0
0 0

[XS] Change in osmo-hnbgw[master]: ps_rab_ass_fsm: Fix potential use-after-free if Tx RAB-ASS-RESP over ...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40276?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: ps_rab_ass_fsm: Fix potential use-after-free if Tx RAB-ASS-RESP over SCCP fails ...................................................................... ps_rab_ass_fsm: Fix potential use-after-free if Tx RAB-ASS-RESP over SCCP fails ps_rab_ass_failure() is already calling osmo_fsm_inst_term(rab_ass->fi(), which will free "fi" and its child talloc struct "rab_ass". Hence, return early as done everywher else in order to avoid accessing the struct again. Change-Id: Id605f2b279a4d886399de27f6a94622ad7bf982b --- M src/osmo-hnbgw/ps_rab_ass_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/src/osmo-hnbgw/ps_rab_ass_fsm.c b/src/osmo-hnbgw/ps_rab_ass_fsm.c index 68bf58a..0e0971e 100644 --- a/src/osmo-hnbgw/ps_rab_ass_fsm.c +++ b/src/osmo-hnbgw/ps_rab_ass_fsm.c @@ -601,8 +601,8 @@ if (rc < 0) { LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "Sending RANAP PS RAB-AssignmentResponse failed\n"); ps_rab_ass_failure(rab_ass); + return; } - /* The request message has been forwarded. We are done. */ osmo_fsm_inst_term(rab_ass->fi, OSMO_FSM_TERM_REGULAR, NULL); } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40276?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: Id605f2b279a4d886399de27f6a94622ad7bf982b Gerrit-Change-Number: 40276 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, 2 weeks

1
0
0 0

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

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40278?usp=email ) 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(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/osmo-hnbgw/kpi_ranap.c b/src/osmo-hnbgw/kpi_ranap.c index c1c77bf..640f838 100644 --- a/src/osmo-hnbgw/kpi_ranap.c +++ b/src/osmo-hnbgw/kpi_ranap.c @@ -52,18 +52,16 @@ /* When Iu is released, all RABs are released implicitly */ for (unsigned int i = 0; i < ARRAY_SIZE(map->rab_state); i++) { - unsigned int ctr_num; switch (map->rab_state[i]) { case RAB_STATE_ACTIVE: if (cause->present == RANAP_Cause_PR_nAS || cause->choice.nAS == RANAP_CauseNAS_normal_release) { - ctr_num = HNB_CTR_RANAP_PS_RAB_REL_IMPLICIT; + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_IMPLICIT : + HNB_CTR_RANAP_CS_RAB_REL_IMPLICIT); } else { - ctr_num = HNB_CTR_RANAP_PS_RAB_REL_IMPLICIT_ABNORMAL; + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_IMPLICIT_ABNORMAL : + HNB_CTR_RANAP_CS_RAB_REL_IMPLICIT_ABNORMAL); } - if (!map->is_ps) - ctr_num++; - HNBP_CTR_INC(hnbp, ctr_num); break; } } @@ -132,7 +130,6 @@ RANAP_RAB_ReleaseItemIEs_t _rab_rel_item_ies = {}; RANAP_RAB_ReleaseItemIEs_t *rab_rel_item_ies = &_rab_rel_item_ies; RANAP_RAB_ReleaseItem_t *rab_rel_item; - unsigned int ctr_num; uint8_t rab_id; if (!release_list_ie) @@ -153,13 +150,12 @@ case RAB_STATE_ACTIVE: if (rab_rel_item->cause.present == RANAP_Cause_PR_nAS && rab_rel_item->cause.choice.nAS == RANAP_CauseNAS_normal_release) { - ctr_num = HNB_CTR_RANAP_PS_RAB_REL_REQ; + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_REQ : + HNB_CTR_RANAP_CS_RAB_REL_REQ); } else { - ctr_num = HNB_CTR_RANAP_PS_RAB_REL_REQ_ABNORMAL; + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_REQ_ABNORMAL : + HNB_CTR_RANAP_CS_RAB_REL_REQ_ABNORMAL); } - if (!map->is_ps) - ctr_num++; - HNBP_CTR_INC(hnbp, ctr_num); break; default: LOG_MAP(map, DRANAP, LOGL_NOTICE, -- 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: merged 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: Support tearing down PFCP upon PS-RAB-ASS-REQ (REL)

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40275?usp=email ) ( 6 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Support tearing down PFCP upon PS-RAB-ASS-REQ (REL) ...................................................................... Support tearing down PFCP upon PS-RAB-ASS-REQ (REL) Before this patch, RAB Assign Request containing only a ReleaseList where being discarded with an error. This commit adds logic to allow passing those messages, and upon RAB Assign Response, tear down the related PFCP sessions before forwarding it back to the CN. This is scenario is tested in TTCN-3 testsuite HNBGW_Tests.TC_ps_rab_release. Related: SYS#7451 Change-Id: Iea7f2cea4aa1fbab12cb8bf0275cd43d9e0713c2 --- M include/osmocom/hnbgw/ps_rab_ass_fsm.h M include/osmocom/hnbgw/ps_rab_fsm.h M src/osmo-hnbgw/ps_rab_ass_fsm.c M src/osmo-hnbgw/ps_rab_fsm.c 4 files changed, 143 insertions(+), 66 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/hnbgw/ps_rab_ass_fsm.h b/include/osmocom/hnbgw/ps_rab_ass_fsm.h index 0728b0d..240cffa 100644 --- a/include/osmocom/hnbgw/ps_rab_ass_fsm.h +++ b/include/osmocom/hnbgw/ps_rab_ass_fsm.h @@ -6,6 +6,7 @@ PS_RAB_ASS_EV_LOCAL_F_TEIDS_RX, PS_RAB_ASS_EV_RAB_ASS_RESP, PS_RAB_ASS_EV_RAB_ESTABLISHED, + PS_RAB_ASS_EV_RAB_RELEASED, PS_RAB_ASS_EV_RAB_FAIL, }; diff --git a/include/osmocom/hnbgw/ps_rab_fsm.h b/include/osmocom/hnbgw/ps_rab_fsm.h index e8dddbe..e812626 100644 --- a/include/osmocom/hnbgw/ps_rab_fsm.h +++ b/include/osmocom/hnbgw/ps_rab_fsm.h @@ -85,7 +85,7 @@ struct ps_rab *ps_rab_get(struct hnbgw_context_map *map, uint8_t rab_id); bool ps_rab_is_established(const struct ps_rab *rab); -void ps_rab_release(struct ps_rab *rab); +void ps_rab_release(struct ps_rab *rab, struct osmo_fsm_inst *notify_fi); struct ps_rab_rx_args { struct addr_teid f_teid; diff --git a/src/osmo-hnbgw/ps_rab_ass_fsm.c b/src/osmo-hnbgw/ps_rab_ass_fsm.c index 0e0971e..c6e8495 100644 --- a/src/osmo-hnbgw/ps_rab_ass_fsm.c +++ b/src/osmo-hnbgw/ps_rab_ass_fsm.c @@ -61,6 +61,7 @@ OSMO_VALUE_STRING(PS_RAB_ASS_EV_LOCAL_F_TEIDS_RX), OSMO_VALUE_STRING(PS_RAB_ASS_EV_RAB_ASS_RESP), OSMO_VALUE_STRING(PS_RAB_ASS_EV_RAB_ESTABLISHED), + OSMO_VALUE_STRING(PS_RAB_ASS_EV_RAB_RELEASED), OSMO_VALUE_STRING(PS_RAB_ASS_EV_RAB_FAIL), {} }; @@ -111,6 +112,9 @@ * ps_rab_fsms, without iterating the RAB Assignment message every time (minor optimisation). */ int rabs_count; int rabs_done_count; + + unsigned int rabs_rel_count; + unsigned int rabs_rel_done_count; }; struct osmo_tdef_state_timeout ps_rab_ass_fsm_timeouts[32] = { @@ -231,32 +235,39 @@ goto no_rab; } - /* Make sure we indeed deal with a setup-or-modify list */ - if (!(ies->presenceMask & RAB_ASSIGNMENTREQUESTIES_RANAP_RAB_SETUPORMODIFYLIST_PRESENT)) { - LOG_MAP(map, DLPFCP, LOGL_ERROR, "RANAP PS RAB AssignmentRequest lacks setup-or-modify list\n"); - goto no_rab; + /* setup-or-modify list */ + if (ies->presenceMask & RAB_ASSIGNMENTREQUESTIES_RANAP_RAB_SETUPORMODIFYLIST_PRESENT) { + /* Multiple RABs may be set up, assemble in list map->ps_rab_list. */ + for (i = 0; i < ies->raB_SetupOrModifyList.list.count; i++) { + RANAP_ProtocolIE_ContainerPair_t *protocol_ie_container_pair; + RANAP_ProtocolIE_FieldPair_t *protocol_ie_field_pair; + + protocol_ie_container_pair = ies->raB_SetupOrModifyList.list.array[i]; + protocol_ie_field_pair = protocol_ie_container_pair->list.array[0]; + if (!protocol_ie_field_pair) + goto no_rab; + if (protocol_ie_field_pair->id != RANAP_ProtocolIE_ID_id_RAB_SetupOrModifyItem) + goto no_rab; + + if (ps_rab_setup_core_remote(rab_ass, protocol_ie_field_pair)) + goto no_rab; + } } - /* Multiple RABs may be set up, assemble in list map->ps_rab_list. */ - for (i = 0; i < ies->raB_SetupOrModifyList.list.count; i++) { - RANAP_ProtocolIE_ContainerPair_t *protocol_ie_container_pair; - RANAP_ProtocolIE_FieldPair_t *protocol_ie_field_pair; + /* Note: ReleaseList is handled at RAB Assign Response time. */ - protocol_ie_container_pair = ies->raB_SetupOrModifyList.list.array[i]; - protocol_ie_field_pair = protocol_ie_container_pair->list.array[0]; - if (!protocol_ie_field_pair) - goto no_rab; - if (protocol_ie_field_pair->id != RANAP_ProtocolIE_ID_id_RAB_SetupOrModifyItem) - goto no_rab; - - if (ps_rab_setup_core_remote(rab_ass, protocol_ie_field_pair)) - goto no_rab; + if (rab_ass->rabs_count > 0) { + /* Got all RABs' state and their Core side GTP info in map->ps_rab_list. + * For each, a ps_rab_fsm has been started and each will call back with + * PS_RAB_ASS_EV_LOCAL_F_TEIDS_RX or PS_RAB_ASS_EV_RAB_FAIL. */ + return ps_rab_ass_fsm_state_chg(rab_ass->fi, PS_RAB_ASS_ST_WAIT_LOCAL_F_TEIDS); } - /* Got all RABs' state and their Core side GTP info in map->ps_rab_list. For each, a ps_rab_fsm has been started and - * each will call back with PS_RAB_ASS_EV_LOCAL_F_TEIDS_RX or PS_RAB_ASS_EV_RAB_FAIL. */ - return ps_rab_ass_fsm_state_chg(rab_ass->fi, PS_RAB_ASS_ST_WAIT_LOCAL_F_TEIDS); - + /* No Setup-or-modify, only Release RABs. Forward the message as is, + * RABs will be released at RAB ASS Response time. */ + map_rua_dispatch(map, MAP_RUA_EV_TX_DIRECT_TRANSFER, ranap_msg); + osmo_fsm_inst_term(rab_ass->fi, OSMO_FSM_TERM_REGULAR, NULL); + return 0; no_rab: ps_rab_ass_failure(rab_ass); return -1; @@ -409,68 +420,127 @@ * each other, we are able to handle mismatching RAB IDs in request and response messages. */ + RANAP_RAB_AssignmentResponseIEs_t *ies = &message->msg.raB_AssignmentResponseIEs; int rc; int i; struct ps_rab_ass *rab_ass; - RANAP_RAB_AssignmentResponseIEs_t *ies; - - /* Make sure we indeed deal with a setup-or-modify list */ - ies = &message->msg.raB_AssignmentResponseIEs; - if (!(ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_SETUPORMODIFIEDLIST_PRESENT)) { - LOG_MAP(map, DRUA, LOGL_ERROR, "RANAP PS RAB AssignmentResponse lacks setup-or-modify list\n"); - return -1; - } rab_ass = ps_rab_ass_alloc(map); - talloc_steal(rab_ass, message); rab_ass->ranap_rab_ass_resp_message = message; - talloc_steal(rab_ass, ranap_msg); rab_ass->ranap_rab_ass_resp_msgb = ranap_msg; /* Now rab_ass owns message and will clean it up */ if (!osmo_pfcp_cp_peer_is_associated(g_hnbgw->pfcp.cp_peer)) { LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "PFCP is not associated, cannot set up GTP mapping\n"); - ps_rab_ass_failure(rab_ass); - return -1; + goto no_rab; } - LOG_PS_RAB_ASS(rab_ass, LOGL_INFO, "PS RAB-AssignmentResponse received, updating RABs\n"); + /* setup-or-modify list */ + if (ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_SETUPORMODIFIEDLIST_PRESENT) { - /* Multiple RABs may be set up, bump matching FSMs in list map->ps_rab_list. */ - for (i = 0; i < ies->raB_SetupOrModifiedList.raB_SetupOrModifiedList_ies.list.count; i++) { - RANAP_IE_t *list_ie; - RANAP_RAB_SetupOrModifiedItemIEs_t item_ies; + LOG_PS_RAB_ASS(rab_ass, LOGL_INFO, "PS RAB-AssignmentResponse received, updating RABs\n"); - list_ie = ies->raB_SetupOrModifiedList.raB_SetupOrModifiedList_ies.list.array[i]; - if (!list_ie) - continue; + /* Multiple RABs may be set up, bump matching FSMs in list map->ps_rab_list. */ + for (i = 0; i < ies->raB_SetupOrModifiedList.raB_SetupOrModifiedList_ies.list.count; i++) { + RANAP_IE_t *list_ie; + RANAP_RAB_SetupOrModifiedItemIEs_t item_ies; - rc = ranap_decode_rab_setupormodifieditemies_fromlist(&item_ies, - &list_ie->value); - if (rc < 0) { - LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "Failed to decode PS RAB-AssignmentResponse" - " SetupOrModifiedItemIEs with list index %d\n", i); - goto continue_cleanloop; - } + list_ie = ies->raB_SetupOrModifiedList.raB_SetupOrModifiedList_ies.list.array[i]; + if (!list_ie) + continue; - if (ps_rab_setup_access_remote(rab_ass, &item_ies.raB_SetupOrModifiedItem)) - LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "Failed to apply PS RAB-AssignmentResponse" - " SetupOrModifiedItemIEs with list index %d\n", i); - rab_ass->rabs_count++; + rc = ranap_decode_rab_setupormodifieditemies_fromlist(&item_ies, + &list_ie->value); + if (rc < 0) { + LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "Failed to decode PS RAB-AssignmentResponse" + " SetupOrModifiedItemIEs with list index %d\n", i); + goto continue_cleanloop; + } + + if (ps_rab_setup_access_remote(rab_ass, &item_ies.raB_SetupOrModifiedItem)) + LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "Failed to apply PS RAB-AssignmentResponse" + " SetupOrModifiedItemIEs with list index %d\n", i); + rab_ass->rabs_count++; continue_cleanloop: - ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifiedItem, &item_ies); + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifiedItem, &item_ies); + } } - /* Got all RABs' state and updated their Access side GTP info in map->ps_rab_list. For each RAB ID, the matching - * ps_rab_fsm has been instructed to tell the UPF about the Access Remote GTP F-TEID. Each will call back with - * PS_RAB_ASS_EV_RAB_ESTABLISHED or PS_RAB_ASS_EV_RAB_FAIL. */ - return ps_rab_ass_fsm_state_chg(rab_ass->fi, PS_RAB_ASS_ST_WAIT_RABS_ESTABLISHED); + /* release list */ + if (ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_RELEASEDLIST_PRESENT) { + /* Multiple RABs may be set up, assemble in list map->ps_rab_list. */ + RANAP_RAB_ReleasedList_t *r_list = &ies->raB_ReleasedList; + for (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 = {}; + RANAP_RAB_ReleasedItemIEs_t *rab_rel_item_ies = &_rab_rel_item_ies; + RANAP_RAB_ReleasedItem_t *rab_rel_item; + uint8_t rab_id; + struct ps_rab *rab; + + if (!released_list_ie) + goto no_rab; + if (released_list_ie->id != RANAP_ProtocolIE_ID_id_RAB_ReleasedItem) + goto no_rab; + + rc = ranap_decode_rab_releaseditemies_fromlist(rab_rel_item_ies, &released_list_ie->value); + if (rc < 0) { + LOG_MAP(map, DLPFCP, LOGL_NOTICE, "Rx RAB ASS REQ (REL): Failed decoding ReleaseItem %u\n", i); + goto no_rab; + } + + rab_rel_item = &rab_rel_item_ies->raB_ReleasedItem; + /* The RAB-ID is defined as a bitstring with a size of 8 (1 byte), + * See also RANAP-IEs.asn, RAB-ID ::= BIT STRING (SIZE (8)) */ + rab_id = rab_rel_item->rAB_ID.buf[0]; + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_ReleasedItem, rab_rel_item_ies); + + rab = ps_rab_get(map, rab_id); + if (rab) { + rab_ass->rabs_rel_count++; + ps_rab_release(rab, rab_ass->fi); + } else { + LOG_MAP(map, DLPFCP, LOGL_NOTICE, "Rx RAB ASS REQ (REL) for unknown rab_id %u\n", rab_id); + } + } + } + + if (rab_ass->rabs_count > 0 || rab_ass->rabs_rel_count > 0) { + /* Got all RABs' state and updated their Access side GTP info in map->ps_rab_list. + * For each RAB ID, the matching ps_rab_fsm has been instructed to tell the UPF about + * the Access Remote GTP F-TEID. Each will call back with PS_RAB_ASS_EV_RAB_ESTABLISHED + * or PS_RAB_ASS_EV_RAB_FAIL. */ + return ps_rab_ass_fsm_state_chg(rab_ass->fi, PS_RAB_ASS_ST_WAIT_RABS_ESTABLISHED); + } + + /* No Setup-or-modify nor Release RABs. Forward the message as is. */ + rc = map_sccp_dispatch(map, MAP_SCCP_EV_TX_DATA_REQUEST, ranap_msg); + if (rc < 0) { + LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "Sending RANAP PS RAB-AssignmentResponse failed\n"); + goto no_rab; + } + /* The request message has been forwarded. We are done. */ + osmo_fsm_inst_term(rab_ass->fi, OSMO_FSM_TERM_REGULAR, NULL); + return 0; + +no_rab: + ps_rab_ass_failure(rab_ass); + return -1; } static void ps_rab_ass_resp_send_if_ready(struct ps_rab_ass *rab_ass); +static void ps_rab_ass_resp_send_if_ready_quick(struct ps_rab_ass *rab_ass) +{ + /* some RABs are still pending, postpone going through the message until all are done. */ + if (rab_ass->rabs_done_count < rab_ass->rabs_count) + return; + if (rab_ass->rabs_rel_done_count < rab_ass->rabs_rel_count) + return; + ps_rab_ass_resp_send_if_ready(rab_ass); +} static void ps_rab_ass_fsm_wait_rabs_established(struct osmo_fsm_inst *fi, uint32_t event, void *data) { @@ -479,12 +549,13 @@ switch (event) { case PS_RAB_ASS_EV_RAB_ESTABLISHED: rab_ass->rabs_done_count++; - if (rab_ass->rabs_done_count < rab_ass->rabs_count) { - /* some RABs are still pending, postpone going through the message until all are done. */ - return; - } /* All RABs have succeeded, ready to forward */ - ps_rab_ass_resp_send_if_ready(rab_ass); + ps_rab_ass_resp_send_if_ready_quick(rab_ass); + return; + + case PS_RAB_ASS_EV_RAB_RELEASED: + rab_ass->rabs_rel_done_count++; + ps_rab_ass_resp_send_if_ready_quick(rab_ass); return; case PS_RAB_ASS_EV_RAB_FAIL: @@ -628,7 +699,7 @@ struct ps_rab_ass *rab_ass, *next; struct ps_rab *rab, *next2; llist_for_each_entry_safe(rab, next2, &map->ps_rab_list, entry) { - ps_rab_release(rab); + ps_rab_release(rab, NULL); } llist_for_each_entry_safe(rab_ass, next, &map->ps_rab_ass_list, entry) { osmo_fsm_inst_term(rab_ass->fi, OSMO_FSM_TERM_REGULAR, NULL); @@ -658,6 +729,7 @@ .action = ps_rab_ass_fsm_wait_rabs_established, .in_event_mask = 0 | S(PS_RAB_ASS_EV_RAB_ESTABLISHED) + | S(PS_RAB_ASS_EV_RAB_RELEASED) | S(PS_RAB_ASS_EV_RAB_FAIL) , }, diff --git a/src/osmo-hnbgw/ps_rab_fsm.c b/src/osmo-hnbgw/ps_rab_fsm.c index 6c9c429..caaed84 100644 --- a/src/osmo-hnbgw/ps_rab_fsm.c +++ b/src/osmo-hnbgw/ps_rab_fsm.c @@ -173,7 +173,7 @@ osmo_fsm_inst_dispatch(rab->req_fi, PS_RAB_ASS_EV_RAB_FAIL, rab); if (rab->resp_fi) osmo_fsm_inst_dispatch(rab->resp_fi, PS_RAB_ASS_EV_RAB_FAIL, rab); - ps_rab_release(rab); + ps_rab_release(rab, NULL); } struct ps_rab *ps_rab_start(struct hnbgw_context_map *map, uint8_t rab_id, @@ -672,6 +672,8 @@ static void ps_rab_fsm_wait_use_count_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct ps_rab *rab = fi->priv; + if (rab->resp_fi) + osmo_fsm_inst_dispatch(rab->resp_fi, PS_RAB_ASS_EV_RAB_RELEASED, rab); OSMO_ASSERT(osmo_use_count_get_put(&rab->use_count, PS_RAB_USE_ACTIVE, -1) == 0); } @@ -704,10 +706,12 @@ ps_rab_forget_map(rab); } -void ps_rab_release(struct ps_rab *rab) +/* notify_fi can be NULL, in which case no event PS_RAB_ASS_EV_RAB_RELEASED event will be dispatched */ +void ps_rab_release(struct ps_rab *rab, struct osmo_fsm_inst *notify_fi) { struct osmo_fsm_inst *fi = rab->fi; ps_rab_forget_map(rab); + rab->resp_fi = notify_fi; switch (fi->state) { case PS_RAB_ST_RX_CORE_REMOTE_F_TEID: /* No session requested yet. Nothing to be deleted. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40275?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: Iea7f2cea4aa1fbab12cb8bf0275cd43d9e0713c2 Gerrit-Change-Number: 40275 Gerrit-PatchSet: 7 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

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

by pespin

Attention is currently required from: daniel, fixeria, laforge, neels, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250?usp=email ) Change subject: sccp: Implement dpc_accessible() ...................................................................... Patch Set 3: (1 comment) File src/sccp_scrc.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250/comment/311fbed9_e1a34… : PS3, Line 75: inst > ``` […] Yes I'm fixing all of this right now, will submit soon. -- 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: comment 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> Gerrit-Comment-Date: Mon, 12 May 2025 15:08:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

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

by daniel

Attention is currently required from: fixeria, laforge, neels, osmith, pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250?usp=email ) Change subject: sccp: Implement dpc_accessible() ...................................................................... Patch Set 3: (1 comment) File src/sccp_scrc.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250/comment/918e4ab7_99944… : PS3, Line 75: inst ``` note: expected 'const struct osmo_ss7_instance *' but argument is of type 'struct osmo_sccp_instance *' ``` I believe the logs also need inst->ss7? -- 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: comment 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 15:00:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 month, 2 weeks

1
0
0 0

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

by laforge

Attention is currently required from: pespin. laforge 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+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: 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: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 14:50:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

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

by laforge

Attention is currently required from: pespin. laforge 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+2 -- 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: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 14:50:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025