cellular-infrastructure
/
osmo-hnbgw
mirror of https://gerrit.osmocom.org/osmo-hnbgw
9
0
Fork 0
Code Issues Releases Wiki Activity

cosmetic: Rename hnbgw_rx_ranap and friends to *_rx_ranap_udt_ul 

Those functions have always been handling only unit-data in uplink
direction, so let's reflect that in the function name to prevent
anyone assuming they process connection-oriented RANAP and/or
the downlink direction.

Change-Id: I29e8176ac19b2e7390e5950b8d0944c8961e491f
This commit is contained in:
Harald Welte 2024-03-08 09:42:50 +01:00 committed by laforge
parent 2b771919dc
commit 51fb6b5578
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osmocom/hnbgw/hnbgw_ranap.h
View File

@ -2,5 +2,5 @@
#include <osmocom/hnbgw/hnbgw.h>
int hnbgw_ranap_rx(struct msgb *msg, uint8_t *data, size_t len);
int hnbgw_ranap_rx_udt_ul(struct msgb *msg, uint8_t *data, size_t len);
int hnbgw_ranap_init(void);

29
src/osmo-hnbgw/hnbgw_ranap.c
View File

@ -35,8 +35,7 @@
#include <osmocom/ranap/ranap_ies_defs.h>
#include <osmocom/ranap/ranap_msg_factory.h>
static int ranap_tx_reset_ack(struct hnb_context *hnb,
RANAP_CN_DomainIndicator_t domain)
static int ranap_tx_udt_dl_reset_ack(struct hnb_context *hnb, RANAP_CN_DomainIndicator_t domain)
{
struct msgb *msg;
int rc;
@ -52,7 +51,7 @@ static int ranap_tx_reset_ack(struct hnb_context *hnb,
return rc;
}
static int ranap_rx_init_reset(struct hnb_context *hnb, ANY_t *in)
static int ranap_rx_udt_ul_init_reset(struct hnb_context *hnb, ANY_t *in)
{
RANAP_ResetIEs_t ies;
int rc, is_ps = 0;
@ -70,12 +69,12 @@ static int ranap_rx_init_reset(struct hnb_context *hnb, ANY_t *in)
/* FIXME: Actually we have to wait for some guard time? */
/* FIXME: Reset all resources related to this HNB/RNC */
ranap_tx_reset_ack(hnb, ies.cN_DomainIndicator);
ranap_tx_udt_dl_reset_ack(hnb, ies.cN_DomainIndicator);
return 0;
}
static int ranap_rx_error_ind(struct hnb_context *hnb, ANY_t *in)
static int ranap_rx_udt_ul_error_ind(struct hnb_context *hnb, ANY_t *in)
{
RANAP_ErrorIndicationIEs_t ies;
int rc;
@ -97,7 +96,7 @@ static int ranap_rx_error_ind(struct hnb_context *hnb, ANY_t *in)
return 0;
}
static int ranap_rx_initiating_msg(struct hnb_context *hnb, RANAP_InitiatingMessage_t *imsg)
static int ranap_rx_udt_ul_initiating_msg(struct hnb_context *hnb, RANAP_InitiatingMessage_t *imsg)
{
int rc = 0;
@ -111,12 +110,12 @@ static int ranap_rx_initiating_msg(struct hnb_context *hnb, RANAP_InitiatingMess
switch (imsg->procedureCode) {
case RANAP_ProcedureCode_id_Reset:
/* Reset request */
rc = ranap_rx_init_reset(hnb, &imsg->value);
rc = ranap_rx_udt_ul_init_reset(hnb, &imsg->value);
break;
case RANAP_ProcedureCode_id_OverloadControl: /* Overload ind */
break;
case RANAP_ProcedureCode_id_ErrorIndication: /* Error ind */
rc = ranap_rx_error_ind(hnb, &imsg->value);
rc = ranap_rx_udt_ul_error_ind(hnb, &imsg->value);
break;
case RANAP_ProcedureCode_id_ResetResource: /* request */
case RANAP_ProcedureCode_id_InformationTransfer:
@ -134,7 +133,7 @@ static int ranap_rx_initiating_msg(struct hnb_context *hnb, RANAP_InitiatingMess
return rc;
}
static int ranap_rx_successful_msg(struct hnb_context *hnb, RANAP_SuccessfulOutcome_t *imsg)
static int ranap_rx_udt_ul_successful_msg(struct hnb_context *hnb, RANAP_SuccessfulOutcome_t *imsg)
{
/* according tot the spec, we can primarily receive Overload,
* Reset, Reset ACK, Error Indication, reset Resource, Reset
@ -164,16 +163,16 @@ static int ranap_rx_successful_msg(struct hnb_context *hnb, RANAP_SuccessfulOutc
static int _hnbgw_ranap_rx(struct hnb_context *hnb, RANAP_RANAP_PDU_t *pdu)
static int _hnbgw_ranap_rx_udt_ul(struct hnb_context *hnb, RANAP_RANAP_PDU_t *pdu)
{
int rc = 0;
switch (pdu->present) {
case RANAP_RANAP_PDU_PR_initiatingMessage:
rc = ranap_rx_initiating_msg(hnb, &pdu->choice.initiatingMessage);
rc = ranap_rx_udt_ul_initiating_msg(hnb, &pdu->choice.initiatingMessage);
break;
case RANAP_RANAP_PDU_PR_successfulOutcome:
rc = ranap_rx_successful_msg(hnb, &pdu->choice.successfulOutcome);
rc = ranap_rx_udt_ul_successful_msg(hnb, &pdu->choice.successfulOutcome);
break;
case RANAP_RANAP_PDU_PR_unsuccessfulOutcome:
LOGHNB(hnb, DRANAP, LOGL_NOTICE, "Received unsupported RANAP "
@ -189,8 +188,8 @@ static int _hnbgw_ranap_rx(struct hnb_context *hnb, RANAP_RANAP_PDU_t *pdu)
return rc;
}
int hnbgw_ranap_rx(struct msgb *msg, uint8_t *data, size_t len)
/* receive a RNAAP Unit-Data message in uplink direction */
int hnbgw_ranap_rx_udt_ul(struct msgb *msg, uint8_t *data, size_t len)
{
RANAP_RANAP_PDU_t _pdu, *pdu = &_pdu;
struct hnb_context *hnb = msg->dst;
@ -205,7 +204,7 @@ int hnbgw_ranap_rx(struct msgb *msg, uint8_t *data, size_t len)
return -1;
}
rc = _hnbgw_ranap_rx(hnb, pdu);
rc = _hnbgw_ranap_rx_udt_ul(hnb, pdu);
return rc;
}

4
src/osmo-hnbgw/hnbgw_rua.c
View File

@ -218,7 +218,7 @@ static struct hnbgw_context_map *create_context_map(struct hnb_context *hnb, uin
/* dispatch a RUA connection-oriented message received from a HNB to a context mapping's RUA FSM, so that it is
* forwarded to the CN via SCCP connection-oriented messages.
* Connectionless messages are handled in hnbgw_ranap_rx() instead, not here. */
* Connectionless messages are handled in hnbgw_ranap_rx_udt_ul() instead, not here. */
static int rua_to_scu(struct hnb_context *hnb,
RUA_CN_DomainIndicator_t cN_DomainIndicator,
enum RUA_ProcedureCode rua_procedure,
@ -484,7 +484,7 @@ static int rua_rx_init_udt(struct msgb *msg, ANY_t *in)
* Information Transfer and Uplink Information Trnansfer that we
* can ignore. In either case, it is RANAP that we need to
* decode... */
rc = hnbgw_ranap_rx(msg, ies.ranaP_Message.buf, ies.ranaP_Message.size);
rc = hnbgw_ranap_rx_udt_ul(msg, ies.ranaP_Message.buf, ies.ranaP_Message.size);
rua_free_connectionlesstransferies(&ies);
return rc;