laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36216?usp=email )

(

1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: cosmetic: talk about cs_rab_ass_* when working in CS domain ......................................................................

cosmetic: talk about cs_rab_ass_* when working in CS domain

There's RAB assignment for CS and PS, let's not name functions too generic to avoid confusion.

Change-Id: Id49ef931e11958315d612d764bbc488ef43f4290 --- M include/osmocom/hnbgw/mgw_fsm.h M src/osmo-hnbgw/context_map_rua.c M src/osmo-hnbgw/context_map_sccp.c M src/osmo-hnbgw/mgw_fsm.c 4 files changed, 18 insertions(+), 6 deletions(-)

Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved

diff --git a/include/osmocom/hnbgw/mgw_fsm.h b/include/osmocom/hnbgw/mgw_fsm.h index d4e989d..2c919e5 100644 --- a/include/osmocom/hnbgw/mgw_fsm.h +++ b/include/osmocom/hnbgw/mgw_fsm.h @@ -2,6 +2,6 @@

#include <osmocom/ranap/ranap_ies_defs.h>

-int handle_rab_ass_req(struct hnbgw_context_map *map, struct msgb *ranap_msg, ranap_message *message); -int mgw_fsm_handle_rab_ass_resp(struct hnbgw_context_map *map, struct msgb *ranap_msg, ranap_message *message); +int handle_cs_rab_ass_req(struct hnbgw_context_map *map, struct msgb *ranap_msg, ranap_message *message); +int mgw_fsm_handle_cs_rab_ass_resp(struct hnbgw_context_map *map, struct msgb *ranap_msg, ranap_message *message); int mgw_fsm_release(struct hnbgw_context_map *map); diff --git a/src/osmo-hnbgw/context_map_rua.c b/src/osmo-hnbgw/context_map_rua.c index 6064b1c..2263792 100644 --- a/src/osmo-hnbgw/context_map_rua.c +++ b/src/osmo-hnbgw/context_map_rua.c @@ -171,7 +171,7 @@ switch (message->procedureCode) { case RANAP_ProcedureCode_id_RAB_Assignment: /* mgw_fsm_handle_rab_ass_resp() takes ownership of prim->oph and (ranap) message */ - return mgw_fsm_handle_rab_ass_resp(map, ranap_msg, message); + return mgw_fsm_handle_cs_rab_ass_resp(map, ranap_msg, message); } } #if ENABLE_PFCP diff --git a/src/osmo-hnbgw/context_map_sccp.c b/src/osmo-hnbgw/context_map_sccp.c index 4a78337..5eb97e2 100644 --- a/src/osmo-hnbgw/context_map_sccp.c +++ b/src/osmo-hnbgw/context_map_sccp.c @@ -218,7 +218,7 @@ switch (message->procedureCode) { case RANAP_ProcedureCode_id_RAB_Assignment: /* mgw_fsm_alloc_and_handle_rab_ass_req() takes ownership of (ranap) message */ - return handle_rab_ass_req(map, ranap_msg, message); + return handle_cs_rab_ass_req(map, ranap_msg, message); case RANAP_ProcedureCode_id_Iu_Release: /* Any IU Release will terminate the MGW FSM, the message itsself is not passed to the * FSM code. It is just forwarded normally by map_rua_tx_dt() below. */ diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c index 77d3961..d405d85 100644 --- a/src/osmo-hnbgw/mgw_fsm.c +++ b/src/osmo-hnbgw/mgw_fsm.c @@ -794,7 +794,7 @@ * \param[in] message decoded RANAP message container, allocated in OTC_SELECT. * This function may talloc_steal(message) to keep it for later. * \returns 0 on success; negative on error. */ -int handle_rab_ass_req(struct hnbgw_context_map *map, struct msgb *ranap_msg, ranap_message *message) +int handle_cs_rab_ass_req(struct hnbgw_context_map *map, struct msgb *ranap_msg, ranap_message *message) { static bool initialized = false; struct mgw_fsm_priv *mgw_fsm_priv; @@ -866,7 +866,7 @@ * \param[in] message decoded RANAP message container, allocated in OTC_SELECT. * This function may talloc_steal(message) to keep it for later. * \returns 0 on success; negative on error. */ -int mgw_fsm_handle_rab_ass_resp(struct hnbgw_context_map *map, struct msgb *ranap_msg, ranap_message *message) +int mgw_fsm_handle_cs_rab_ass_resp(struct hnbgw_context_map *map, struct msgb *ranap_msg, ranap_message *message) { struct mgw_fsm_priv *mgw_fsm_priv;