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

ranap_common_cn: add functions for direct access to decoder 

The message encoder functions that decode a message to a struct
ranap_message are only accessible via a callback function that is passed
to ranap_cn_rx_cx The decoded ranap_message only lives inside the callback
since it is freed by ranap_cn_rx_cx when the callback is done. In some
situations this might make using the decoder incredibly difficult since
it is not possible to keep the decoding results for an extended amount
of time. Lets put the decoding into a separate function and use this
function in ranap_cn_rx_cx. Then lets make the decoder and the free
function public so that the decoder can be used in a more open way.

Change-Id: I14d2ed8e597a5d12024a6a6c72ff011dbeb2549d
Related: OS#5152
This commit is contained in:
Philipp Maier 2022-01-28 11:42:52 +01:00
parent fb58a448b1
commit ca6054ef8c
2 changed files with 58 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/osmocom/ranap/ranap_common_cn.h
View File

@ -7,8 +7,20 @@
typedef void (*ranap_handle_cb)(void *ctx, ranap_message *ranap_msg); typedef void (*ranap_handle_cb)(void *ctx, ranap_message *ranap_msg);
/* free a decoded connection-less RANAP message */
void ranap_cn_rx_cl_free(ranap_message *message);
/* decode a connection-less RANAP message */
int ranap_cn_rx_cl_decode(void *ctx, ranap_message *message, uint8_t *data, size_t len);
/* receive a connection-less RANAP message */ /* receive a connection-less RANAP message */
int ranap_cn_rx_cl(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len); int ranap_cn_rx_cl(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len);
/* free a decoded connection-oriented RANAP message */
void ranap_cn_rx_co_free(ranap_message *message);
/* decode a connection-oriented RANAP message */
int ranap_cn_rx_co_decode(void *ctx, ranap_message *message, uint8_t *data, size_t len);
/* receive a connection-oriented RANAP message */ /* receive a connection-oriented RANAP message */
int ranap_cn_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len); int ranap_cn_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len);

72
src/ranap_common_cn.c
View File

@ -257,7 +257,8 @@ static int _cn_ranap_rx_co(void *ctx, RANAP_RANAP_PDU_t *pdu, ranap_message *mes
return rc; return rc;
} }
static void _cn_ranap_free_co(ranap_message *message) /* free a decoded connection-oriented RANAP message */
void ranap_cn_rx_co_free(ranap_message *message)
{ {
switch (message->direction) { switch (message->direction) {
case RANAP_RANAP_PDU_PR_initiatingMessage: case RANAP_RANAP_PDU_PR_initiatingMessage:
@ -281,27 +282,38 @@ static void _cn_ranap_free_co(ranap_message *message)
} }
} }
/* receive a connection-oriented RANAP message and call /* decode a connection-oriented RANAP message */
* cn_ranap_handle_co() with the resulting ranap_message struct */ int ranap_cn_rx_co_decode(void *ctx, ranap_message *message, uint8_t *data, size_t len)
int ranap_cn_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len)
{ {
RANAP_RANAP_PDU_t *pdu = NULL; RANAP_RANAP_PDU_t *pdu = NULL;
ranap_message message;
asn_dec_rval_t dec_ret; asn_dec_rval_t dec_ret;
int rc; int rc;
memset(&message, 0, sizeof(message)); memset(message, 0, sizeof(*message));
dec_ret = aper_decode(NULL,&asn_DEF_RANAP_RANAP_PDU, (void **) &pdu, dec_ret = aper_decode(NULL, &asn_DEF_RANAP_RANAP_PDU, (void **)&pdu, data, len, 0, 0);
data, len, 0, 0);
if (dec_ret.code != RC_OK) { if (dec_ret.code != RC_OK) {
LOGP(DRANAP, LOGL_ERROR, "Error in RANAP ASN.1 decode\n"); LOGP(DRANAP, LOGL_ERROR, "Error in RANAP ASN.1 decode\n");
return -1; return -1;
} }
message.direction = pdu->present; message->direction = pdu->present;
rc = _cn_ranap_rx_co(ctx, pdu, &message); rc = _cn_ranap_rx_co(ctx, pdu, message);
ASN_STRUCT_FREE(asn_DEF_RANAP_RANAP_PDU, pdu);
return rc;
}
/* receive a connection-oriented RANAP message and call
* cn_ranap_handle_co() with the resulting ranap_message struct */
int ranap_cn_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len)
{
ranap_message message;
int rc;
rc = ranap_cn_rx_co_decode(ctx, &message, data, len);
if (rc == 0) if (rc == 0)
(*cb)(ctx, &message); (*cb)(ctx, &message);
@ -309,9 +321,7 @@ int ranap_cn_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len)
LOGP(DRANAP, LOGL_ERROR, "Not calling cn_ranap_handle_co() due to rc=%d\n", rc); LOGP(DRANAP, LOGL_ERROR, "Not calling cn_ranap_handle_co() due to rc=%d\n", rc);
/* Free the asn1 structs in message */ /* Free the asn1 structs in message */
_cn_ranap_free_co(&message); ranap_cn_rx_co_free(&message);
ASN_STRUCT_FREE(asn_DEF_RANAP_RANAP_PDU, pdu);
return rc; return rc;
} }
@ -496,7 +506,8 @@ static int _cn_ranap_rx_cl(void *ctx, RANAP_RANAP_PDU_t *pdu, ranap_message *mes
return rc; return rc;
} }
static void _cn_ranap_free_cl(ranap_message *message) /* free a decoded connection-less RANAP message */
void ranap_cn_rx_cl_free(ranap_message *message)
{ {
switch (message->direction) { switch (message->direction) {
case RANAP_RANAP_PDU_PR_initiatingMessage: case RANAP_RANAP_PDU_PR_initiatingMessage:
@ -516,27 +527,38 @@ static void _cn_ranap_free_cl(ranap_message *message)
} }
} }
/* receive a connection-less RANAP message and call /* decode a connection-less RANAP message */
* cn_ranap_handle_co() with the resulting ranap_message struct */ int ranap_cn_rx_cl_decode(void *ctx, ranap_message *message, uint8_t *data, size_t len)
int ranap_cn_rx_cl(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len)
{ {
RANAP_RANAP_PDU_t *pdu = NULL; RANAP_RANAP_PDU_t *pdu = NULL;
ranap_message message;
asn_dec_rval_t dec_ret; asn_dec_rval_t dec_ret;
int rc; int rc;
memset(&message, 0, sizeof(message)); memset(message, 0, sizeof(*message));
dec_ret = aper_decode(NULL,&asn_DEF_RANAP_RANAP_PDU, (void **) &pdu, dec_ret = aper_decode(NULL, &asn_DEF_RANAP_RANAP_PDU, (void **)&pdu, data, len, 0, 0);
data, len, 0, 0);
if (dec_ret.code != RC_OK) { if (dec_ret.code != RC_OK) {
LOGP(DRANAP, LOGL_ERROR, "Error in RANAP ASN.1 decode\n"); LOGP(DRANAP, LOGL_ERROR, "Error in RANAP ASN.1 decode\n");
return -1; return -1;
} }
message.direction = pdu->present; message->direction = pdu->present;
rc = _cn_ranap_rx_cl(ctx, pdu, &message); rc = _cn_ranap_rx_cl(ctx, pdu, message);
ASN_STRUCT_FREE(asn_DEF_RANAP_RANAP_PDU, pdu);
return rc;
}
/* receive a connection-less RANAP message and call
* cn_ranap_handle_co() with the resulting ranap_message struct */
int ranap_cn_rx_cl(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len)
{
ranap_message message;
int rc;
rc = ranap_cn_rx_cl_decode(ctx, &message, data, len);
if (rc == 0) if (rc == 0)
(*cb)(ctx, &message); (*cb)(ctx, &message);
@ -544,9 +566,7 @@ int ranap_cn_rx_cl(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len)
LOGP(DRANAP, LOGL_ERROR, "Not calling cn_ranap_handle_cl() due to rc=%d\n", rc); LOGP(DRANAP, LOGL_ERROR, "Not calling cn_ranap_handle_cl() due to rc=%d\n", rc);
/* Free the asn1 structs in message */ /* Free the asn1 structs in message */
_cn_ranap_free_cl(&message); ranap_cn_rx_cl_free(&message);
ASN_STRUCT_FREE(asn_DEF_RANAP_RANAP_PDU, pdu);
return rc; return rc;
} }