laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36210?usp=email )

Change subject: cosmetic: align downlink RANAP unitdata function names with uplink ......................................................................

cosmetic: align downlink RANAP unitdata function names with uplink

In uplink we use *ranap_rx_udt_ul*, so let's use the same naming pattern for processing dowlink unit-data messages to make things more consistent. Also, make sure udt is always part of functions that only handle unitdata - not to be confused with connection-oriented messages.

Change-Id: I1792e4c2cdce145ae906c181898163bcda36328d --- M src/osmo-hnbgw/hnbgw_cn.c 1 file changed, 26 insertions(+), 13 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/10/36210/1

diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 6871a21..7c75bc7 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -314,10 +314,10 @@ return 0; }

-static int cn_ranap_rx_initiating_msg(struct hnbgw_cnlink *cnlink, - const struct osmo_scu_unitdata_param *unitdata, - RANAP_InitiatingMessage_t *imsg, - const uint8_t *data, unsigned int len) +static int ranap_rx_udt_dl_initiating_msg(struct hnbgw_cnlink *cnlink, + const struct osmo_scu_unitdata_param *unitdata, + RANAP_InitiatingMessage_t *imsg, + const uint8_t *data, unsigned int len) { switch (imsg->procedureCode) { case RANAP_ProcedureCode_id_Reset: @@ -343,8 +343,8 @@ return 0; }

-static int cn_ranap_rx_successful_msg(struct hnbgw_cnlink *cnlink, - RANAP_SuccessfulOutcome_t *omsg) +static int ranap_rx_udt_dl_successful_msg(struct hnbgw_cnlink *cnlink, + RANAP_SuccessfulOutcome_t *omsg) { switch (omsg->procedureCode) { case RANAP_ProcedureCode_id_Reset: /* Reset acknowledge */ @@ -365,19 +365,18 @@ }

-static int _cn_ranap_rx(struct hnbgw_cnlink *cnlink, - const struct osmo_scu_unitdata_param *unitdata, - RANAP_RANAP_PDU_t *pdu, const uint8_t *data, unsigned int len) +static int hnbgw_ranap_rx_udt_dl(struct hnbgw_cnlink *cnlink, + const struct osmo_scu_unitdata_param *unitdata, + RANAP_RANAP_PDU_t *pdu, const uint8_t *data, unsigned int len) { int rc;

switch (pdu->present) { case RANAP_RANAP_PDU_PR_initiatingMessage: - rc = cn_ranap_rx_initiating_msg(cnlink, unitdata, &pdu->choice.initiatingMessage, - data, len); + rc = ranap_rx_udt_dl_initiating_msg(cnlink, unitdata, &pdu->choice.initiatingMessage, data, len); break; case RANAP_RANAP_PDU_PR_successfulOutcome: - rc = cn_ranap_rx_successful_msg(cnlink, &pdu->choice.successfulOutcome); + rc = ranap_rx_udt_dl_successful_msg(cnlink, &pdu->choice.successfulOutcome); break; case RANAP_RANAP_PDU_PR_unsuccessfulOutcome: LOGP(DRANAP, LOGL_NOTICE, "Received unsupported RANAP " @@ -410,7 +409,7 @@ return -1; }

- rc = _cn_ranap_rx(cnlink, unitdata, pdu, data, len); + rc = hnbgw_ranap_rx_udt_dl(cnlink, unitdata, pdu, data, len); ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RANAP_PDU, pdu);

return rc;