pespin has uploaded this change for review.
ranap: Constify multiple ptr params
Change-Id: I667dc2ef377c1ceb5b11315458f00b282c143c81
---
M include/osmocom/ranap/ranap_common_cn.h
M include/osmocom/ranap/ranap_common_ran.h
M include/osmocom/ranap/ranap_msg_factory.h
M src/ranap_common_cn.c
M src/ranap_common_ran.c
M src/ranap_msg_factory.c
6 files changed, 28 insertions(+), 28 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/57/40957/1
diff --git a/include/osmocom/ranap/ranap_common_cn.h b/include/osmocom/ranap/ranap_common_cn.h
index 5f82378..89f82a9 100644
--- a/include/osmocom/ranap/ranap_common_cn.h
+++ b/include/osmocom/ranap/ranap_common_cn.h
@@ -9,20 +9,20 @@
void ranap_cn_rx_cl_free(ranap_message *message);
/* decode a connection-less RANAP message */
-int ranap_cn_rx_cl_decode2(ranap_message *message, uint8_t *data, size_t len);
-int ranap_cn_rx_cl_decode(void *unused, ranap_message *message, uint8_t *data, size_t len)
+int ranap_cn_rx_cl_decode2(ranap_message *message, const uint8_t *data, size_t len);
+int ranap_cn_rx_cl_decode(void *unused, ranap_message *message, const uint8_t *data, size_t len)
OSMO_DEPRECATED("Use ranap_cn_rx_cl_decode2() instead, the first arg is not used");
/* receive a connection-less RANAP message */
-int ranap_cn_rx_cl(ranap_handle_cb cb, void *priv, uint8_t *data, size_t len);
+int ranap_cn_rx_cl(ranap_handle_cb cb, void *priv, const 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_decode2(ranap_message *message, uint8_t *data, size_t len);
-int ranap_cn_rx_co_decode(void *unused, ranap_message *message, uint8_t *data, size_t len)
+int ranap_cn_rx_co_decode2(ranap_message *message, const uint8_t *data, size_t len);
+int ranap_cn_rx_co_decode(void *unused, ranap_message *message, const uint8_t *data, size_t len)
OSMO_DEPRECATED("Use ranap_cn_rx_co_decode2() instead, the first arg is not used");
/* receive a connection-oriented RANAP message */
-int ranap_cn_rx_co(ranap_handle_cb cb, void *priv, uint8_t *data, size_t len);
+int ranap_cn_rx_co(ranap_handle_cb cb, void *priv, const uint8_t *data, size_t len);
diff --git a/include/osmocom/ranap/ranap_common_ran.h b/include/osmocom/ranap/ranap_common_ran.h
index d632c46..785b3bb 100644
--- a/include/osmocom/ranap/ranap_common_ran.h
+++ b/include/osmocom/ranap/ranap_common_ran.h
@@ -9,9 +9,9 @@
void ranap_ran_rx_co_free(ranap_message *message);
/* decode a connection-oriented RANAP message */
-int ranap_ran_rx_co_decode2(ranap_message *message, uint8_t *data, size_t len);
-int ranap_ran_rx_co_decode(void *unused, ranap_message *message, uint8_t *data, size_t len)
+int ranap_ran_rx_co_decode2(ranap_message *message, const uint8_t *data, size_t len);
+int ranap_ran_rx_co_decode(void *unused, ranap_message *message, const uint8_t *data, size_t len)
OSMO_DEPRECATED("Use ranap_ran_rx_co_decode2() instead, the first arg is not used");
/* receive a connection-oriented RANAP message */
-int ranap_ran_rx_co(ranap_handle_cb cb, void *priv, uint8_t *data, size_t len);
+int ranap_ran_rx_co(ranap_handle_cb cb, void *priv, const uint8_t *data, size_t len);
diff --git a/include/osmocom/ranap/ranap_msg_factory.h b/include/osmocom/ranap/ranap_msg_factory.h
index 318e511..0a4bdf2 100644
--- a/include/osmocom/ranap/ranap_msg_factory.h
+++ b/include/osmocom/ranap/ranap_msg_factory.h
@@ -49,17 +49,17 @@
const RANAP_Cause_t *cause);
struct msgb *ranap_new_msg_reset2(RANAP_CN_DomainIndicator_t domain,
const RANAP_Cause_t *cause,
- RANAP_GlobalRNC_ID_t *rnc_id);
+ const RANAP_GlobalRNC_ID_t *rnc_id);
/*! \brief generate RANAP RESET ACK message */
struct msgb *ranap_new_msg_reset_ack(RANAP_CN_DomainIndicator_t domain,
- RANAP_GlobalRNC_ID_t *rnc_id);
+ const RANAP_GlobalRNC_ID_t *rnc_id);
/*! \brief generate RANAP INITIAL UE message */
struct msgb *ranap_new_msg_initial_ue(uint32_t conn_id, int is_ps,
- RANAP_GlobalRNC_ID_t *rnc_id,
- uint8_t *nas_pdu, unsigned int nas_len);
+ const RANAP_GlobalRNC_ID_t *rnc_id,
+ const uint8_t *nas_pdu, unsigned int nas_len);
/*! \brief generate RANAP IU RELEASE REQUEST message */
struct msgb *ranap_new_msg_iu_rel_req(const RANAP_Cause_t *cause);
@@ -72,4 +72,4 @@
const RANAP_Cause_t *cause,
const uint32_t *conn_id_list,
unsigned int conn_id_list_len,
- RANAP_GlobalRNC_ID_t *rnc_id);
+ const RANAP_GlobalRNC_ID_t *rnc_id);
diff --git a/src/ranap_common_cn.c b/src/ranap_common_cn.c
index 8d0cc0c..a16d127 100644
--- a/src/ranap_common_cn.c
+++ b/src/ranap_common_cn.c
@@ -376,7 +376,7 @@
}
/* decode a connection-oriented RANAP message */
-int ranap_cn_rx_co_decode2(ranap_message *message, uint8_t *data, size_t len)
+int ranap_cn_rx_co_decode2(ranap_message *message, const uint8_t *data, size_t len)
{
RANAP_RANAP_PDU_t *pdu = NULL;
asn_dec_rval_t dec_ret;
@@ -401,14 +401,14 @@
return rc;
}
-int ranap_cn_rx_co_decode(void *unused, ranap_message *message, uint8_t *data, size_t len)
+int ranap_cn_rx_co_decode(void *unused, ranap_message *message, const uint8_t *data, size_t len)
{
return ranap_cn_rx_co_decode2(message, data, len);
}
/* 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 *priv, uint8_t *data, size_t len)
+int ranap_cn_rx_co(ranap_handle_cb cb, void *priv, const uint8_t *data, size_t len)
{
ranap_message message;
int rc;
@@ -624,7 +624,7 @@
}
/* decode a connection-less RANAP message */
-int ranap_cn_rx_cl_decode2(ranap_message *message, uint8_t *data, size_t len)
+int ranap_cn_rx_cl_decode2(ranap_message *message, const uint8_t *data, size_t len)
{
RANAP_RANAP_PDU_t *pdu = NULL;
asn_dec_rval_t dec_ret;
@@ -649,14 +649,14 @@
return rc;
}
-int ranap_cn_rx_cl_decode(void *unused, ranap_message *message, uint8_t *data, size_t len)
+int ranap_cn_rx_cl_decode(void *unused, ranap_message *message, const uint8_t *data, size_t len)
{
return ranap_cn_rx_cl_decode2(message, data, len);
}
/* 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 *priv, uint8_t *data, size_t len)
+int ranap_cn_rx_cl(ranap_handle_cb cb, void *priv, const uint8_t *data, size_t len)
{
ranap_message message;
int rc;
diff --git a/src/ranap_common_ran.c b/src/ranap_common_ran.c
index 4028611..33da6b7 100644
--- a/src/ranap_common_ran.c
+++ b/src/ranap_common_ran.c
@@ -289,7 +289,7 @@
}
/* decode a connection-oriented RANAP message */
-int ranap_ran_rx_co_decode2(ranap_message *message, uint8_t *data, size_t len)
+int ranap_ran_rx_co_decode2(ranap_message *message, const uint8_t *data, size_t len)
{
RANAP_RANAP_PDU_t *pdu = NULL;
asn_dec_rval_t dec_ret;
@@ -314,14 +314,14 @@
return rc;
}
-int ranap_ran_rx_co_decode(void *unused, ranap_message *message, uint8_t *data, size_t len)
+int ranap_ran_rx_co_decode(void *unused, ranap_message *message, const uint8_t *data, size_t len)
{
return ranap_ran_rx_co_decode2(message, data, len);
}
/* receive a connection-oriented RANAP message and call
* cn_ranap_handle_co() with the resulting ranap_message struct */
-int ranap_ran_rx_co(ranap_handle_cb cb, void *priv, uint8_t *data, size_t len)
+int ranap_ran_rx_co(ranap_handle_cb cb, void *priv, const uint8_t *data, size_t len)
{
ranap_message message;
int rc;
diff --git a/src/ranap_msg_factory.c b/src/ranap_msg_factory.c
index ffe2355..8f6a99a 100644
--- a/src/ranap_msg_factory.c
+++ b/src/ranap_msg_factory.c
@@ -49,7 +49,7 @@
/*! generate RANAP RESET message. Like ranap_new_msg_reset(), but allows passing a Global-RNC-ID. */
struct msgb *ranap_new_msg_reset2(RANAP_CN_DomainIndicator_t domain,
const RANAP_Cause_t *cause,
- RANAP_GlobalRNC_ID_t *rnc_id)
+ const RANAP_GlobalRNC_ID_t *rnc_id)
{
RANAP_ResetIEs_t ies;
RANAP_Reset_t out;
@@ -89,7 +89,7 @@
/*! \brief generate RANAP RESET ACK message */
struct msgb *ranap_new_msg_reset_ack(RANAP_CN_DomainIndicator_t domain,
- RANAP_GlobalRNC_ID_t *rnc_id)
+ const RANAP_GlobalRNC_ID_t *rnc_id)
{
RANAP_ResetAcknowledgeIEs_t ies;
RANAP_ResetAcknowledge_t out;
@@ -131,8 +131,8 @@
/*! \brief generate RANAP INITIAL UE message */
struct msgb *ranap_new_msg_initial_ue(uint32_t conn_id, int is_ps,
- RANAP_GlobalRNC_ID_t *rnc_id,
- uint8_t *nas_pdu, unsigned int nas_len)
+ const RANAP_GlobalRNC_ID_t *rnc_id,
+ const uint8_t *nas_pdu, unsigned int nas_len)
{
RANAP_InitialUE_MessageIEs_t ies;
RANAP_InitialUE_Message_t out;
@@ -971,7 +971,7 @@
const RANAP_Cause_t *cause,
const uint32_t *conn_id_list,
unsigned int conn_id_list_len,
- RANAP_GlobalRNC_ID_t *rnc_id)
+ const RANAP_GlobalRNC_ID_t *rnc_id)
{
RANAP_ResetResourceItemIEs_t item_ies;
RANAP_ResetResourceIEs_t ies;
To view, visit change 40957. To unsubscribe, or for help writing mail filters, visit settings.