pespin has uploaded this change for review.
Apply uniform prefix to remaining APIs in gprs_ranap.h
Change-Id: I4f253f35013085bdebf80e94ab0d2f771e40dba6
---
M include/osmocom/sgsn/gprs_ranap.h
M src/sgsn/gprs_gmm.c
M src/sgsn/gprs_gmm_attach.c
M src/sgsn/gprs_ranap.c
M src/sgsn/iu_client.c
5 files changed, 21 insertions(+), 21 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/63/40963/1
diff --git a/include/osmocom/sgsn/gprs_ranap.h b/include/osmocom/sgsn/gprs_ranap.h
index 92b453d..491ef6c 100644
--- a/include/osmocom/sgsn/gprs_ranap.h
+++ b/include/osmocom/sgsn/gprs_ranap.h
@@ -15,17 +15,17 @@
int sgsn_ranap_iu_event(struct ranap_ue_conn_ctx *ctx, enum ranap_iu_event_type type, void *data);
-int ranap_iu_tx(struct msgb *msg, uint8_t sapi);
+int sgsn_ranap_iu_tx(struct msgb *msg, uint8_t sapi);
int sgsn_ranap_iu_tx_rab_ps_ass_req(struct ranap_ue_conn_ctx *ue_ctx,
uint8_t rab_id, uint32_t gtp_ip, uint32_t gtp_tei);
-int ranap_iu_tx_sec_mode_cmd(struct ranap_ue_conn_ctx *uectx, struct osmo_auth_vector *vec,
+int sgsn_ranap_iu_tx_sec_mode_cmd(struct ranap_ue_conn_ctx *uectx, struct osmo_auth_vector *vec,
int send_ck, int new_key);
-int ranap_iu_tx_common_id(struct ranap_ue_conn_ctx *ue_ctx, const char *imsi);
-int ranap_iu_tx_paging_cmd(struct osmo_sccp_addr *called_addr,
+int sgsn_ranap_iu_tx_common_id(struct ranap_ue_conn_ctx *ue_ctx, const char *imsi);
+int sgsn_ranap_iu_tx_paging_cmd(struct osmo_sccp_addr *called_addr,
const char *imsi, const uint32_t *tmsi,
bool is_ps, uint32_t paging_cause);
-int ranap_iu_tx_release(struct ranap_ue_conn_ctx *ctx, const struct RANAP_Cause *cause);
+int sgsn_ranap_iu_tx_release(struct ranap_ue_conn_ctx *ctx, const struct RANAP_Cause *cause);
/* Transmit a Iu Release Command and submit event RANAP_IU_EVENT_IU_RELEASE upon
* Release Complete or timeout. Caller is responsible to free the context and
* closing the SCCP connection (sgsn_ranap_iu_free_ue) upon recieval of the event. */
diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c
index 2a10b92..439eca3 100644
--- a/src/sgsn/gprs_gmm.c
+++ b/src/sgsn/gprs_gmm.c
@@ -123,13 +123,13 @@
rate_ctr_inc(rate_ctr_group_get_ctr(mm->ctrg, GMM_CTR_PKTS_SIG_OUT));
#ifdef BUILD_IU
if (mm->ran_type == MM_CTX_T_UTRAN_Iu)
- return ranap_iu_tx(msg, GPRS_SAPI_GMM);
+ return sgsn_ranap_iu_tx(msg, GPRS_SAPI_GMM);
#endif
}
#ifdef BUILD_IU
if (MSG_IU_UE_CTX(msg))
- return ranap_iu_tx(msg, GPRS_SAPI_GMM);
+ return sgsn_ranap_iu_tx(msg, GPRS_SAPI_GMM);
#endif
/* caller needs to provide TLLI, BVCI and NSEI */
@@ -979,7 +979,7 @@
send_ck ? "sending" : "not sending", sgsn->cfg.uea_encryption_mask);
/* FIXME: we should send the set of allowed UEA, as in ranap_new_msg_sec_mod_cmd2(). However, this
* is not possible in the iu_client API. See OS#5487. */
- rc = ranap_iu_tx_sec_mode_cmd(ctx->iu.ue_ctx, &ctx->auth_triplet.vec, send_ck, ctx->iu.new_key);
+ rc = sgsn_ranap_iu_tx_sec_mode_cmd(ctx->iu.ue_ctx, &ctx->auth_triplet.vec, send_ck, ctx->iu.new_key);
ctx->iu.new_key = 0;
return rc;
}
@@ -1453,7 +1453,7 @@
#ifdef BUILD_IU
if (mmctx->iu.ue_ctx) {
- ranap_iu_tx_release(mmctx->iu.ue_ctx, NULL);
+ sgsn_ranap_iu_tx_release(mmctx->iu.ue_ctx, NULL);
}
#endif
diff --git a/src/sgsn/gprs_gmm_attach.c b/src/sgsn/gprs_gmm_attach.c
index 839ad83..3dc581d 100644
--- a/src/sgsn/gprs_gmm_attach.c
+++ b/src/sgsn/gprs_gmm_attach.c
@@ -277,7 +277,7 @@
/* FIXME: we should send the set of allowed UEA, as in ranap_new_msg_sec_mod_cmd2(). However, this
* is not possible in the iu_client API. See OS#5487. */
- ranap_iu_tx_sec_mode_cmd(ctx->iu.ue_ctx, &ctx->auth_triplet.vec, send_ck, ctx->iu.new_key);
+ sgsn_ranap_iu_tx_sec_mode_cmd(ctx->iu.ue_ctx, &ctx->auth_triplet.vec, send_ck, ctx->iu.new_key);
ctx->iu.new_key = 0;
#endif
}
diff --git a/src/sgsn/gprs_ranap.c b/src/sgsn/gprs_ranap.c
index 91d06e2..950e234 100644
--- a/src/sgsn/gprs_ranap.c
+++ b/src/sgsn/gprs_ranap.c
@@ -214,7 +214,7 @@
*/
/* Continue authentication here */
mm->iu.ue_ctx->integrity_active = 1;
- ranap_iu_tx_common_id(mm->iu.ue_ctx, mm->imsi);
+ sgsn_ranap_iu_tx_common_id(mm->iu.ue_ctx, mm->imsi);
/* FIXME: remove gmm_authorize */
if (mm->pending_req != GSM48_MT_GMM_ATTACH_REQ)
@@ -271,7 +271,7 @@
return sgsn_sccp_user_iups_tx_data_req(ue_ctx->scu_iups, ue_ctx->conn_id, msg);
}
-int ranap_iu_tx_sec_mode_cmd(struct ranap_ue_conn_ctx *uectx, struct osmo_auth_vector *vec,
+int sgsn_ranap_iu_tx_sec_mode_cmd(struct ranap_ue_conn_ctx *uectx, struct osmo_auth_vector *vec,
int send_ck, int new_key)
{
struct msgb *msg;
@@ -282,7 +282,7 @@
return sgsn_sccp_user_iups_tx_data_req(uectx->scu_iups, uectx->conn_id, msg);
}
-int ranap_iu_tx_common_id(struct ranap_ue_conn_ctx *uectx, const char *imsi)
+int sgsn_ranap_iu_tx_common_id(struct ranap_ue_conn_ctx *uectx, const char *imsi)
{
struct msgb *msg;
@@ -299,7 +299,7 @@
*
* If TMSI is given, the IMSI is not sent over the air interface. Nevertheless,
* the IMSI is still required for resolution in the HNB-GW and/or(?) RNC. */
-int ranap_iu_tx_paging_cmd(struct osmo_sccp_addr *called_addr,
+int sgsn_ranap_iu_tx_paging_cmd(struct osmo_sccp_addr *called_addr,
const char *imsi, const uint32_t *tmsi,
bool is_ps, uint32_t paging_cause)
{
@@ -309,7 +309,7 @@
return osmo_sccp_tx_unitdata_msg(sgsn->sccp.scu_iups->scu, &sgsn->sccp.scu_iups->local_sccp_addr, called_addr, msg);
}
-int ranap_iu_tx(struct msgb *msg_nas, uint8_t sapi)
+int sgsn_ranap_iu_tx(struct msgb *msg_nas, uint8_t sapi)
{
struct ranap_ue_conn_ctx *uectx = msg_nas->dst;
struct msgb *msg;
@@ -332,7 +332,7 @@
/* Send Iu Release for the given UE connection.
* If cause is NULL, Normal Release cause is sent, otherwise
* the provided cause. */
-int ranap_iu_tx_release(struct ranap_ue_conn_ctx *uectx, const struct RANAP_Cause *cause)
+int sgsn_ranap_iu_tx_release(struct ranap_ue_conn_ctx *uectx, const struct RANAP_Cause *cause)
{
struct msgb *msg;
static const struct RANAP_Cause default_cause = {
@@ -353,7 +353,7 @@
{
ctx->notification = false;
ctx->free_on_release = true;
- int ret = ranap_iu_tx_release(ctx, cause);
+ int ret = sgsn_ranap_iu_tx_release(ctx, cause);
/* On Tx failure, trigger timeout immediately, as the response will never arrive */
if (ret)
timeout = 0;
@@ -511,7 +511,7 @@
static int ranap_handle_co_iu_rel_req(struct ranap_ue_conn_ctx *ue_ctx, const RANAP_Iu_ReleaseRequestIEs_t *ies)
{
LOGP(DRANAP, LOGL_INFO, "Received Iu Release Request, Sending Release Command\n");
- ranap_iu_tx_release(ue_ctx, &ies->cause);
+ sgsn_ranap_iu_tx_release(ue_ctx, &ies->cause);
return 0;
}
diff --git a/src/sgsn/iu_client.c b/src/sgsn/iu_client.c
index 950a264..d392152 100644
--- a/src/sgsn/iu_client.c
+++ b/src/sgsn/iu_client.c
@@ -146,7 +146,7 @@
iu_rnc_lac_rac_find_legacy(&rnc, NULL, lac, rac);
if (rnc) {
- if (ranap_iu_tx_paging_cmd(&rnc->sccp_addr, imsi, tmsi_or_ptmsi, is_ps, 0) == 0) {
+ if (sgsn_ranap_iu_tx_paging_cmd(&rnc->sccp_addr, imsi, tmsi_or_ptmsi, is_ps, 0) == 0) {
log_msg = "Paging";
log_level = LOGL_DEBUG;
paged = 1;
@@ -206,7 +206,7 @@
if (osmo_lai_cmp(&entry->rai.lac, lai))
continue;
- rc = ranap_iu_tx_paging_cmd(&rnc->sccp_addr, imsi, tmsi, false, 0);
+ rc = sgsn_ranap_iu_tx_paging_cmd(&rnc->sccp_addr, imsi, tmsi, false, 0);
if (rc > 0) {
LOGPIU(LOGL_ERROR, "IuCS: Failed to tx Paging RNC %s for LAC %s for IMSI %s / TMSI %08x",
osmo_rnc_id_name(&rnc->rnc_id),
@@ -252,7 +252,7 @@
if (osmo_rai_cmp(&entry->rai, rai))
continue;
- rc = ranap_iu_tx_paging_cmd(&rnc->sccp_addr, imsi, ptmsi, true, 0);
+ rc = sgsn_ranap_iu_tx_paging_cmd(&rnc->sccp_addr, imsi, ptmsi, true, 0);
if (rc > 0) {
LOGPIU(LOGL_ERROR, "IuPS: Failed to tx Paging RNC %s for RAC %s for IMSI %s / P-TMSI %08x",
osmo_rnc_id_name(&rnc->rnc_id),
To view, visit change 40963. To unsubscribe, or for help writing mail filters, visit settings.