From fcf2444ee14158fe693db23744938ba67ca359a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Leroy?= <frederic.leroy@b-com.com>
Date: Fri, 22 Jul 2016 11:21:21 +0200
Subject: [PATCH] UE/EMM: remove redondant ueid in prototypes
---
openair3/NAS/UE/EMM/EmmStatusHdl.c | 4 ++--
openair3/NAS/UE/EMM/SAP/emm_as.c | 13 +++++--------
openair3/NAS/UE/EMM/emm_proc.h | 2 +-
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/openair3/NAS/UE/EMM/EmmStatusHdl.c b/openair3/NAS/UE/EMM/EmmStatusHdl.c
index 320ca985ff..89dd50207f 100644
--- a/openair3/NAS/UE/EMM/EmmStatusHdl.c
+++ b/openair3/NAS/UE/EMM/EmmStatusHdl.c
@@ -115,7 +115,7 @@ int emm_proc_status_ind(unsigned int ueid, int emm_cause)
** Others: None **
** **
***************************************************************************/
-int emm_proc_status(nas_user_t *user, unsigned int ueid, int emm_cause)
+int emm_proc_status(nas_user_t *user, int emm_cause)
{
LOG_FUNC_IN;
@@ -132,7 +132,7 @@ int emm_proc_status(nas_user_t *user, unsigned int ueid, int emm_cause)
*/
emm_sap.primitive = EMMAS_STATUS_IND;
emm_sap.u.emm_as.u.status.emm_cause = emm_cause;
- emm_sap.u.emm_as.u.status.ueid = ueid;
+ emm_sap.u.emm_as.u.status.ueid = user->ueid;
emm_sap.u.emm_as.u.status.guti = user->emm_data->guti;
sctx = user->emm_data->security;
diff --git a/openair3/NAS/UE/EMM/SAP/emm_as.c b/openair3/NAS/UE/EMM/SAP/emm_as.c
index dfe055f4d6..2112b59164 100644
--- a/openair3/NAS/UE/EMM/SAP/emm_as.c
+++ b/openair3/NAS/UE/EMM/SAP/emm_as.c
@@ -97,7 +97,7 @@ static const char *_emm_as_primitive_str[] = {
* Functions executed to process EMM procedures upon receiving
* data from the network
*/
-static int _emm_as_recv(nas_user_t *user, unsigned int ueid, const char *msg, int len,
+static int _emm_as_recv(nas_user_t *user, const char *msg, int len,
int *emm_cause);
static int _emm_as_establish_cnf(nas_user_t *user, const emm_as_establish_t *msg, int *emm_cause);
@@ -194,15 +194,12 @@ int emm_as_send(nas_user_t *user, const emm_as_t *msg)
int emm_cause = EMM_CAUSE_SUCCESS;
emm_as_primitive_t primitive = msg->primitive;
- uint32_t ueid = user->ueid;
-
LOG_TRACE(INFO, "EMMAS-SAP - Received primitive %s (%d)",
_emm_as_primitive_str[primitive - _EMMAS_START - 1], primitive);
switch (primitive) {
case _EMMAS_DATA_IND:
rc = _emm_as_data_ind(user, &msg->u.data, &emm_cause);
- ueid = msg->u.data.ueid;
break;
@@ -264,7 +261,7 @@ int emm_as_send(nas_user_t *user, const emm_as_t *msg)
LOG_TRACE(WARNING, "EMMAS-SAP - Received EMM message is not valid "
"(cause=%d)", emm_cause);
/* Return an EMM status message */
- rc = emm_proc_status(user, ueid, emm_cause);
+ rc = emm_proc_status(user, emm_cause);
}
if (rc != RETURNok) {
@@ -304,7 +301,7 @@ int emm_as_send(nas_user_t *user, const emm_as_t *msg)
** Others: None **
** **
***************************************************************************/
-static int _emm_as_recv(nas_user_t *user, unsigned int ueid, const char *msg, int len,
+static int _emm_as_recv(nas_user_t *user, const char *msg, int len,
int *emm_cause)
{
LOG_FUNC_IN;
@@ -336,7 +333,7 @@ static int _emm_as_recv(nas_user_t *user, unsigned int ueid, const char *msg, in
switch (emm_msg->header.message_type) {
case EMM_STATUS:
- rc = emm_recv_status(ueid, &emm_msg->emm_status, emm_cause);
+ rc = emm_recv_status(user->ueid, &emm_msg->emm_status, emm_cause);
break;
case IDENTITY_REQUEST:
@@ -441,7 +438,7 @@ static int _emm_as_data_ind(nas_user_t *user, const emm_as_data_t *msg, int *emm
} else if (header.protocol_discriminator ==
EPS_MOBILITY_MANAGEMENT_MESSAGE) {
/* Process EMM data */
- rc = _emm_as_recv(user, msg->ueid, plain_msg, bytes, emm_cause);
+ rc = _emm_as_recv(user, plain_msg, bytes, emm_cause);
} else if (header.protocol_discriminator ==
EPS_SESSION_MANAGEMENT_MESSAGE) {
const OctetString data = {bytes, (uint8_t *)plain_msg};
diff --git a/openair3/NAS/UE/EMM/emm_proc.h b/openair3/NAS/UE/EMM/emm_proc.h
index 333343b6ca..3abf554ef7 100644
--- a/openair3/NAS/UE/EMM/emm_proc.h
+++ b/openair3/NAS/UE/EMM/emm_proc.h
@@ -66,7 +66,7 @@ Description Defines the EPS Mobility Management procedures executed at
*---------------------------------------------------------------------------
*/
int emm_proc_status_ind(unsigned int ueid, int emm_cause);
-int emm_proc_status(nas_user_t *user, unsigned int ueid, int emm_cause);
+int emm_proc_status(nas_user_t *user, int emm_cause);
/*
*---------------------------------------------------------------------------
--
GitLab