Skip to content

O
OpenXG-RAN
Commit 708013af authored by Cedric Roux's avatar Cedric Roux
Browse files
Options

- Mapped ESM/EBR data context to EMM data context in NAS MME 

- Corrected Initial context setup req message

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4778 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 56440427
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 881 additions and 674 deletions
openair-cn/COMMON/nas_messages_types.h
View file @ 708013af
...@@ -3,16 +3,16 @@ ...@@ -3,16 +3,16 @@
#ifndef NAS_MESSAGES_TYPES_H_ #ifndef NAS_MESSAGES_TYPES_H_
#define NAS_MESSAGES_TYPES_H_ #define NAS_MESSAGES_TYPES_H_
#define NAS_UL_DATA_IND(mSGpTR) (mSGpTR)->ittiMsg.nas_ul_data_ind #define NAS_UL_DATA_IND(mSGpTR) (mSGpTR)->ittiMsg.nas_ul_data_ind
#define NAS_DL_DATA_REQ(mSGpTR) (mSGpTR)->ittiMsg.nas_dl_data_req #define NAS_DL_DATA_REQ(mSGpTR) (mSGpTR)->ittiMsg.nas_dl_data_req
#define NAS_DL_DATA_CNF(mSGpTR) (mSGpTR)->ittiMsg.nas_dl_data_cnf #define NAS_DL_DATA_CNF(mSGpTR) (mSGpTR)->ittiMsg.nas_dl_data_cnf
#define NAS_CONN_EST_IND(mSGpTR) (mSGpTR)->ittiMsg.nas_conn_est_ind #define NAS_CONN_EST_IND(mSGpTR) (mSGpTR)->ittiMsg.nas_conn_est_ind
#define NAS_CONN_EST_CNF(mSGpTR) (mSGpTR)->ittiMsg.nas_conn_est_cnf #define NAS_CONNECTION_ESTABLISHMENT_CNF(mSGpTR) (mSGpTR)->ittiMsg.nas_conn_est_cnf
#define NAS_BEARER_PARAM(mSGpTR) (mSGpTR)->ittiMsg.nas_bearer_param #define NAS_BEARER_PARAM(mSGpTR) (mSGpTR)->ittiMsg.nas_bearer_param
#define NAS_AUTHENTICATION_REQ(mSGpTR) (mSGpTR)->ittiMsg.nas_auth_req #define NAS_AUTHENTICATION_REQ(mSGpTR) (mSGpTR)->ittiMsg.nas_auth_req
#define NAS_AUTHENTICATION_PARAM_REQ(mSGpTR) (mSGpTR)->ittiMsg.nas_auth_param_req #define NAS_AUTHENTICATION_PARAM_REQ(mSGpTR) (mSGpTR)->ittiMsg.nas_auth_param_req
#define NAS_AUTHENTICATION_PARAM_RSP(mSGpTR) (mSGpTR)->ittiMsg.nas_auth_param_rsp #define NAS_AUTHENTICATION_PARAM_RSP(mSGpTR) (mSGpTR)->ittiMsg.nas_auth_param_rsp
#define NAS_AUTHENTICATION_PARAM_FAIL(mSGpTR) (mSGpTR)->ittiMsg.nas_auth_param_fail #define NAS_AUTHENTICATION_PARAM_FAIL(mSGpTR) (mSGpTR)->ittiMsg.nas_auth_param_fail
typedef struct nas_paging_ind_s { typedef struct nas_paging_ind_s {
...@@ -29,6 +29,7 @@ typedef struct nas_conn_est_ind_s { ...@@ -29,6 +29,7 @@ typedef struct nas_conn_est_ind_s {
typedef nas_establish_rsp_t nas_conn_est_rej_t; typedef nas_establish_rsp_t nas_conn_est_rej_t;
#if defined(DISABLE_USE_NAS)
typedef struct nas_conn_est_cnf_s { typedef struct nas_conn_est_cnf_s {
uint32_t ue_id; uint32_t ue_id;
...@@ -36,6 +37,9 @@ typedef struct nas_conn_est_cnf_s { ...@@ -36,6 +37,9 @@ typedef struct nas_conn_est_cnf_s {
/* Transparent message from MME_APP to S1AP */ /* Transparent message from MME_APP to S1AP */
s1ap_initial_ctxt_setup_req_t transparent; s1ap_initial_ctxt_setup_req_t transparent;
} nas_conn_est_cnf_t; } nas_conn_est_cnf_t;
#else
typedef nas_establish_cnf_t nas_conn_est_cnf_t;
#endif
typedef struct nas_bearer_param_s { typedef struct nas_bearer_param_s {
unsigned eNB_ue_s1ap_id:24; unsigned eNB_ue_s1ap_id:24;
......
openair-cn/NAS/EURECOM-NAS/src/emm/Attach.c
View file @ 708013af
...@@ -1117,6 +1117,7 @@ int emm_proc_attach_request(unsigned int ueid, emm_proc_attach_type_t type, ...@@ -1117,6 +1117,7 @@ int emm_proc_attach_request(unsigned int ueid, emm_proc_attach_type_t type,
(*emm_ctx)->esm_msg.value = NULL; (*emm_ctx)->esm_msg.value = NULL;
(*emm_ctx)->emm_cause = EMM_CAUSE_SUCCESS; (*emm_ctx)->emm_cause = EMM_CAUSE_SUCCESS;
(*emm_ctx)->_emm_fsm_status = EMM_INVALID; (*emm_ctx)->_emm_fsm_status = EMM_INVALID;
(*emm_ctx)->ueid = ueid;
emm_fsm_set_status(ueid, *emm_ctx, EMM_DEREGISTERED); emm_fsm_set_status(ueid, *emm_ctx, EMM_DEREGISTERED);
#if defined(EPC_BUILD) #if defined(EPC_BUILD)
...@@ -1130,7 +1131,6 @@ int emm_proc_attach_request(unsigned int ueid, emm_proc_attach_type_t type, ...@@ -1130,7 +1131,6 @@ int emm_proc_attach_request(unsigned int ueid, emm_proc_attach_type_t type,
if (rc != RETURNok) { if (rc != RETURNok) {
LOG_TRACE(WARNING, "EMM-PROC - Failed to update EMM context"); LOG_TRACE(WARNING, "EMM-PROC - Failed to update EMM context");
/* Do not accept the UE to attach to the network */ /* Do not accept the UE to attach to the network */
(*emm_ctx)->ueid = ueid;
(*emm_ctx)->emm_cause = EMM_CAUSE_ILLEGAL_UE; (*emm_ctx)->emm_cause = EMM_CAUSE_ILLEGAL_UE;
rc = _emm_attach_reject(*emm_ctx); rc = _emm_attach_reject(*emm_ctx);
} else { } else {
...@@ -1216,12 +1216,13 @@ int emm_proc_attach_reject(unsigned int ueid, int emm_cause) ...@@ -1216,12 +1216,13 @@ int emm_proc_attach_reject(unsigned int ueid, int emm_cause)
***************************************************************************/ ***************************************************************************/
int emm_proc_attach_complete(unsigned int ueid, const OctetString *esm_msg) int emm_proc_attach_complete(unsigned int ueid, const OctetString *esm_msg)
{ {
LOG_FUNC_IN; emm_data_context_t *emm_ctx = NULL;
int rc = RETURNerror; int rc = RETURNerror;
emm_sap_t emm_sap; emm_sap_t emm_sap;
esm_sap_t esm_sap; esm_sap_t esm_sap;
LOG_FUNC_IN;
LOG_TRACE(INFO, "EMM-PROC - EPS attach complete (ueid=%u)", ueid); LOG_TRACE(INFO, "EMM-PROC - EPS attach complete (ueid=%u)", ueid);
/* Stop timer T3450 */ /* Stop timer T3450 */
...@@ -1238,7 +1239,6 @@ int emm_proc_attach_complete(unsigned int ueid, const OctetString *esm_msg) ...@@ -1238,7 +1239,6 @@ int emm_proc_attach_complete(unsigned int ueid, const OctetString *esm_msg)
} }
/* Get the UE context */ /* Get the UE context */
emm_data_context_t *emm_ctx = NULL;
#if defined(EPC_BUILD) #if defined(EPC_BUILD)
if (ueid > 0) { if (ueid > 0) {
...@@ -1263,6 +1263,7 @@ int emm_proc_attach_complete(unsigned int ueid, const OctetString *esm_msg) ...@@ -1263,6 +1263,7 @@ int emm_proc_attach_complete(unsigned int ueid, const OctetString *esm_msg)
esm_sap.is_standalone = FALSE; esm_sap.is_standalone = FALSE;
esm_sap.ueid = ueid; esm_sap.ueid = ueid;
esm_sap.recv = esm_msg; esm_sap.recv = esm_msg;
esm_sap.ctx = emm_ctx;
rc = esm_sap_send(&esm_sap); rc = esm_sap_send(&esm_sap);
} else { } else {
LOG_TRACE(ERROR, "EMM-PROC - No EMM context exists"); LOG_TRACE(ERROR, "EMM-PROC - No EMM context exists");
...@@ -1276,6 +1277,7 @@ int emm_proc_attach_complete(unsigned int ueid, const OctetString *esm_msg) ...@@ -1276,6 +1277,7 @@ int emm_proc_attach_complete(unsigned int ueid, const OctetString *esm_msg)
*/ */
emm_sap.primitive = EMMREG_ATTACH_CNF; emm_sap.primitive = EMMREG_ATTACH_CNF;
emm_sap.u.emm_reg.ueid = ueid; emm_sap.u.emm_reg.ueid = ueid;
emm_sap.u.emm_reg.ctx = emm_ctx;
rc = emm_sap_send(&emm_sap); rc = emm_sap_send(&emm_sap);
} else if (esm_sap.err != ESM_SAP_DISCARDED) { } else if (esm_sap.err != ESM_SAP_DISCARDED) {
/* /*
...@@ -1283,6 +1285,7 @@ int emm_proc_attach_complete(unsigned int ueid, const OctetString *esm_msg) ...@@ -1283,6 +1285,7 @@ int emm_proc_attach_complete(unsigned int ueid, const OctetString *esm_msg)
*/ */
emm_sap.primitive = EMMREG_ATTACH_REJ; emm_sap.primitive = EMMREG_ATTACH_REJ;
emm_sap.u.emm_reg.ueid = ueid; emm_sap.u.emm_reg.ueid = ueid;
emm_sap.u.emm_reg.ctx = emm_ctx;
rc = emm_sap_send(&emm_sap); rc = emm_sap_send(&emm_sap);
} else { } else {
/* /*
...@@ -1748,14 +1751,17 @@ static int _emm_attach_reject(void *args) ...@@ -1748,14 +1751,17 @@ static int _emm_attach_reject(void *args)
***************************************************************************/ ***************************************************************************/
static int _emm_attach_abort(void *args) static int _emm_attach_abort(void *args)
{ {
LOG_FUNC_IN;
int rc = RETURNerror; int rc = RETURNerror;
emm_data_context_t *ctx = NULL;
attach_data_t *data;
attach_data_t *data = (attach_data_t *)(args); LOG_FUNC_IN;
data = (attach_data_t *)(args);
if (data) { if (data) {
unsigned int ueid = data->ueid; unsigned int ueid = data->ueid;
esm_sap_t esm_sap;
LOG_TRACE(WARNING, "EMM-PROC - Abort the attach procedure (ueid=%u)", LOG_TRACE(WARNING, "EMM-PROC - Abort the attach procedure (ueid=%u)",
ueid); ueid);
...@@ -1771,15 +1777,22 @@ static int _emm_attach_abort(void *args) ...@@ -1771,15 +1777,22 @@ static int _emm_attach_abort(void *args)
} }
free(data); free(data);
#if defined(EPC_BUILD)
ctx = emm_data_context_get(&_emm_data, ueid);
#else
ctx = _emm_data.ctx[ueid];
#endif
/* /*
* Notify ESM that the network locally refused PDN connectivity * Notify ESM that the network locally refused PDN connectivity
* to the UE * to the UE
*/ */
esm_sap_t esm_sap;
esm_sap.primitive = ESM_PDN_CONNECTIVITY_REJ; esm_sap.primitive = ESM_PDN_CONNECTIVITY_REJ;
esm_sap.ueid = ueid; esm_sap.ueid = ueid;
esm_sap.ctx = ctx;
esm_sap.recv = NULL; esm_sap.recv = NULL;
rc = esm_sap_send(&esm_sap); rc = esm_sap_send(&esm_sap);
if (rc != RETURNerror) { if (rc != RETURNerror) {
/* /*
* Notify EMM that EPS attach procedure failed * Notify EMM that EPS attach procedure failed
...@@ -1787,16 +1800,9 @@ static int _emm_attach_abort(void *args) ...@@ -1787,16 +1800,9 @@ static int _emm_attach_abort(void *args)
emm_sap_t emm_sap; emm_sap_t emm_sap;
emm_sap.primitive = EMMREG_ATTACH_REJ; emm_sap.primitive = EMMREG_ATTACH_REJ;
emm_sap.u.emm_reg.ueid = ueid; emm_sap.u.emm_reg.ueid = ueid;
emm_sap.u.emm_reg.ctx = ctx;
rc = emm_sap_send(&emm_sap); rc = emm_sap_send(&emm_sap);
if (rc != RETURNerror) { if (rc != RETURNerror) {
struct emm_data_context_s *ctx = NULL;
#if defined(EPC_BUILD)
ctx = emm_data_context_get(&_emm_data, ueid);
#else
ctx = _emm_data.ctx[ueid];
#endif
/* Release the UE context */ /* Release the UE context */
rc = _emm_attach_release(ctx); rc = _emm_attach_release(ctx);
} }
...@@ -2098,6 +2104,7 @@ static int _emm_attach(void *args) ...@@ -2098,6 +2104,7 @@ static int _emm_attach(void *args)
esm_sap.primitive = ESM_PDN_CONNECTIVITY_REQ; esm_sap.primitive = ESM_PDN_CONNECTIVITY_REQ;
esm_sap.is_standalone = FALSE; esm_sap.is_standalone = FALSE;
esm_sap.ueid = emm_ctx->ueid; esm_sap.ueid = emm_ctx->ueid;
esm_sap.ctx = emm_ctx;
esm_sap.recv = &emm_ctx->esm_msg; esm_sap.recv = &emm_ctx->esm_msg;
rc = esm_sap_send(&esm_sap); rc = esm_sap_send(&esm_sap);
...@@ -2214,6 +2221,7 @@ static int _emm_attach_accept(emm_data_context_t *emm_ctx, attach_data_t *data) ...@@ -2214,6 +2221,7 @@ static int _emm_attach_accept(emm_data_context_t *emm_ctx, attach_data_t *data)
* Notify EMM-AS SAP that Attach Accept message together with an Activate * Notify EMM-AS SAP that Attach Accept message together with an Activate
* Default EPS Bearer Context Request message has to be sent to the UE * Default EPS Bearer Context Request message has to be sent to the UE
*/ */
emm_sap.primitive = EMMAS_ESTABLISH_CNF; emm_sap.primitive = EMMAS_ESTABLISH_CNF;
emm_sap.u.emm_as.u.establish.ueid = emm_ctx->ueid; emm_sap.u.emm_as.u.establish.ueid = emm_ctx->ueid;
if (emm_ctx->guti_is_new && emm_ctx->old_guti) { if (emm_ctx->guti_is_new && emm_ctx->old_guti) {
...@@ -2387,6 +2395,26 @@ static int _emm_attach_update(emm_data_context_t *ctx, unsigned int ueid, ...@@ -2387,6 +2395,26 @@ static int _emm_attach_update(emm_data_context_t *ctx, unsigned int ueid,
} else { } else {
return (RETURNerror); return (RETURNerror);
} }
} else {
if (ctx->guti == NULL) {
ctx->guti = (GUTI_t *)malloc(sizeof(GUTI_t));
}
if (ctx->guti != NULL) {
/* TODO: FIXME */
ctx->guti->gummei.plmn.MCCdigit1 = 2;
ctx->guti->gummei.plmn.MCCdigit2 = 0;
ctx->guti->gummei.plmn.MCCdigit3 = 8;
ctx->guti->gummei.plmn.MNCdigit1 = 9;
ctx->guti->gummei.plmn.MNCdigit2 = 2;
ctx->guti->gummei.plmn.MNCdigit3 = 15;
ctx->guti->gummei.MMEcode = 0;
ctx->guti->gummei.MMEgid = 0;
ctx->guti->m_tmsi = (uint32_t) ctx;
} else {
return (RETURNerror);
}
} }
/* The IMSI if provided by the UE */ /* The IMSI if provided by the UE */
if (imsi) { if (imsi) {
......
openair-cn/NAS/EURECOM-NAS/src/emm/Detach.c
View file @ 708013af
...@@ -512,6 +512,7 @@ int emm_proc_detach_request(unsigned int ueid, emm_proc_detach_type_t type, ...@@ -512,6 +512,7 @@ int emm_proc_detach_request(unsigned int ueid, emm_proc_detach_type_t type,
esm_sap_t esm_sap; esm_sap_t esm_sap;
esm_sap.primitive = ESM_EPS_BEARER_CONTEXT_DEACTIVATE_REQ; esm_sap.primitive = ESM_EPS_BEARER_CONTEXT_DEACTIVATE_REQ;
esm_sap.ueid = ueid; esm_sap.ueid = ueid;
esm_sap.ctx = emm_ctx;
esm_sap.data.eps_bearer_context_deactivate.ebi = ESM_SAP_ALL_EBI; esm_sap.data.eps_bearer_context_deactivate.ebi = ESM_SAP_ALL_EBI;
rc = esm_sap_send(&esm_sap); rc = esm_sap_send(&esm_sap);
...@@ -522,6 +523,7 @@ int emm_proc_detach_request(unsigned int ueid, emm_proc_detach_type_t type, ...@@ -522,6 +523,7 @@ int emm_proc_detach_request(unsigned int ueid, emm_proc_detach_type_t type,
*/ */
emm_sap.primitive = EMMREG_DETACH_REQ; emm_sap.primitive = EMMREG_DETACH_REQ;
emm_sap.u.emm_reg.ueid = ueid; emm_sap.u.emm_reg.ueid = ueid;
emm_sap.u.emm_reg.ctx = emm_ctx;
rc = emm_sap_send(&emm_sap); rc = emm_sap_send(&emm_sap);
} }
} }
......
openair-cn/NAS/EURECOM-NAS/src/emm/LowerLayer.c
View file @ 708013af
...@@ -202,14 +202,26 @@ int lowerlayer_release(int cause) ...@@ -202,14 +202,26 @@ int lowerlayer_release(int cause)
***************************************************************************/ ***************************************************************************/
int lowerlayer_data_ind(unsigned int ueid, const OctetString *data) int lowerlayer_data_ind(unsigned int ueid, const OctetString *data)
{ {
LOG_FUNC_IN;
esm_sap_t esm_sap; esm_sap_t esm_sap;
int rc; int rc;
#if defined(NAS_MME)
emm_data_context_t *emm_ctx;
#endif
LOG_FUNC_IN;
#if defined(NAS_MME)
if (ueid > 0) {
emm_ctx = emm_data_context_get(&_emm_data, ueid);
}
#endif
esm_sap.primitive = ESM_UNITDATA_IND; esm_sap.primitive = ESM_UNITDATA_IND;
esm_sap.is_standalone = TRUE; esm_sap.is_standalone = TRUE;
esm_sap.ueid = ueid; esm_sap.ueid = ueid;
#if defined(NAS_MME)
esm_sap.ctx = emm_ctx;
#endif
esm_sap.recv = data; esm_sap.recv = data;
rc = esm_sap_send(&esm_sap); rc = esm_sap_send(&esm_sap);
......
openair-cn/NAS/EURECOM-NAS/src/emm/emmData.h
View file @ 708013af
...@@ -28,6 +28,8 @@ Description Defines internal private data handled by EPS Mobility ...@@ -28,6 +28,8 @@ Description Defines internal private data handled by EPS Mobility
#include "OctetString.h" #include "OctetString.h"
#include "nas_timer.h" #include "nas_timer.h"
#include "esmData.h"
#ifdef NAS_MME #ifdef NAS_MME
#include "emm_fsm.h" #include "emm_fsm.h"
#include "mme_api.h" #include "mme_api.h"
...@@ -348,6 +350,8 @@ typedef struct emm_data_context_s { ...@@ -348,6 +350,8 @@ typedef struct emm_data_context_s {
int emm_cause; /* EMM failure cause code */ int emm_cause; /* EMM failure cause code */
emm_fsm_state_t _emm_fsm_status; emm_fsm_state_t _emm_fsm_status;
esm_data_context_t esm_data_ctx;
} emm_data_context_t; } emm_data_context_t;
/* /*
......
openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_as.c
View file @ 708013af
...@@ -1092,7 +1092,7 @@ static int _emm_as_send(const emm_as_t *msg) ...@@ -1092,7 +1092,7 @@ static int _emm_as_send(const emm_as_t *msg)
LOG_FUNC_RETURN (RETURNok); LOG_FUNC_RETURN (RETURNok);
} break; } break;
case AS_NAS_ESTABLISH_RSP: { case AS_NAS_ESTABLISH_CNF: {
if (as_msg.msg.nas_establish_rsp.errCode != AS_SUCCESS) { if (as_msg.msg.nas_establish_rsp.errCode != AS_SUCCESS) {
nas_itti_dl_data_req(as_msg.msg.nas_establish_rsp.UEid, nas_itti_dl_data_req(as_msg.msg.nas_establish_rsp.UEid,
as_msg.msg.nas_establish_rsp.nasMsg.data, as_msg.msg.nas_establish_rsp.nasMsg.data,
...@@ -1100,6 +1100,11 @@ static int _emm_as_send(const emm_as_t *msg) ...@@ -1100,6 +1100,11 @@ static int _emm_as_send(const emm_as_t *msg)
LOG_FUNC_RETURN (RETURNok); LOG_FUNC_RETURN (RETURNok);
} else { } else {
/* Handle success case */ /* Handle success case */
nas_itti_establish_cnf(as_msg.msg.nas_establish_rsp.UEid,
as_msg.msg.nas_establish_rsp.errCode,
as_msg.msg.nas_establish_rsp.nasMsg.data,
as_msg.msg.nas_establish_rsp.nasMsg.length);
LOG_FUNC_RETURN (RETURNok);
} }
} break; } break;
...@@ -1670,7 +1675,7 @@ static int _emm_as_establish_cnf(const emm_as_establish_t *msg, ...@@ -1670,7 +1675,7 @@ static int _emm_as_establish_cnf(const emm_as_establish_t *msg,
LOG_FUNC_IN; LOG_FUNC_IN;
LOG_TRACE(INFO, "EMMAS-SAP - Send AS connection establish response"); LOG_TRACE(INFO, "EMMAS-SAP - Send AS connection establish confirmation");
nas_message_t nas_msg; nas_message_t nas_msg;
memset(&nas_msg, 0 , sizeof(nas_message_t)); memset(&nas_msg, 0 , sizeof(nas_message_t));
...@@ -1678,6 +1683,7 @@ static int _emm_as_establish_cnf(const emm_as_establish_t *msg, ...@@ -1678,6 +1683,7 @@ static int _emm_as_establish_cnf(const emm_as_establish_t *msg,
/* Setup the AS message */ /* Setup the AS message */
as_msg->UEid = msg->ueid; as_msg->UEid = msg->ueid;
if (msg->UEid.guti == NULL) { if (msg->UEid.guti == NULL) {
LOG_TRACE(WARNING, "EMMAS-SAP - GUTI is NULL...");
LOG_FUNC_RETURN (0); LOG_FUNC_RETURN (0);
} }
as_msg->s_tmsi.MMEcode = msg->UEid.guti->gummei.MMEcode; as_msg->s_tmsi.MMEcode = msg->UEid.guti->gummei.MMEcode;
...@@ -1703,9 +1709,11 @@ static int _emm_as_establish_cnf(const emm_as_establish_t *msg, ...@@ -1703,9 +1709,11 @@ static int _emm_as_establish_cnf(const emm_as_establish_t *msg,
int bytes = _emm_as_encode(&as_msg->nasMsg, &nas_msg, size); int bytes = _emm_as_encode(&as_msg->nasMsg, &nas_msg, size);
if (bytes > 0) { if (bytes > 0) {
as_msg->errCode = AS_SUCCESS; as_msg->errCode = AS_SUCCESS;
LOG_FUNC_RETURN (AS_NAS_ESTABLISH_RSP); LOG_FUNC_RETURN (AS_NAS_ESTABLISH_CNF);
} }
} }
LOG_TRACE(WARNING, "EMMAS-SAP - Size <= 0");
LOG_FUNC_RETURN (0); LOG_FUNC_RETURN (0);
} }
......
openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_esmDef.h
View file @ 708013af
...@@ -24,6 +24,7 @@ Description Defines the EMMESM Service Access Point that provides ...@@ -24,6 +24,7 @@ Description Defines the EMMESM Service Access Point that provides
#define __EMM_ESMDEF_H__ #define __EMM_ESMDEF_H__
#include "OctetString.h" #include "OctetString.h"
#include "emmData.h"
/****************************************************************************/ /****************************************************************************/
/********************* G L O B A L C O N S T A N T S *******************/ /********************* G L O B A L C O N S T A N T S *******************/
...@@ -76,6 +77,9 @@ typedef struct { ...@@ -76,6 +77,9 @@ typedef struct {
typedef struct { typedef struct {
emm_esm_primitive_t primitive; emm_esm_primitive_t primitive;
unsigned int ueid; unsigned int ueid;
#if defined(NAS_MME)
emm_data_context_t *ctx;
#endif
union { union {
emm_esm_establish_t establish; emm_esm_establish_t establish;
emm_esm_data_t data; emm_esm_data_t data;
......
openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_sap.h
View file @ 708013af
...@@ -23,6 +23,7 @@ Description Defines the EMM Service Access Points at which the EPS ...@@ -23,6 +23,7 @@ Description Defines the EMM Service Access Points at which the EPS
#ifndef __EMM_SAP_H__ #ifndef __EMM_SAP_H__
#define __EMM_SAP_H__ #define __EMM_SAP_H__
#include "emmData.h"
#include "emm_regDef.h" #include "emm_regDef.h"
#include "emm_esmDef.h" #include "emm_esmDef.h"
#include "emm_asDef.h" #include "emm_asDef.h"
......
openair-cn/NAS/EURECOM-NAS/src/esm/DedicatedEpsBearerContextActivation.c
View file @ 708013af
...@@ -65,7 +65,7 @@ static void *_dedicated_eps_bearer_activate_t3485_handler(void *); ...@@ -65,7 +65,7 @@ static void *_dedicated_eps_bearer_activate_t3485_handler(void *);
* retransmission counter */ * retransmission counter */
#define DEDICATED_EPS_BEARER_ACTIVATE_COUNTER_MAX 5 #define DEDICATED_EPS_BEARER_ACTIVATE_COUNTER_MAX 5
static int _dedicated_eps_bearer_activate(unsigned int ueid, int ebi, static int _dedicated_eps_bearer_activate(emm_data_context_t *ctx, int ebi,
const OctetString *msg); const OctetString *msg);
#endif // NAS_MME #endif // NAS_MME
...@@ -102,7 +102,7 @@ static int _dedicated_eps_bearer_activate(unsigned int ueid, int ebi, ...@@ -102,7 +102,7 @@ static int _dedicated_eps_bearer_activate(unsigned int ueid, int ebi,
** Others: None ** ** Others: None **
** ** ** **
***************************************************************************/ ***************************************************************************/
int esm_proc_dedicated_eps_bearer_context(unsigned int ueid, int pid, int esm_proc_dedicated_eps_bearer_context(emm_data_context_t *ctx, int pid,
unsigned int *ebi, unsigned int *ebi,
unsigned int *default_ebi, unsigned int *default_ebi,
const esm_proc_qos_t *qos, const esm_proc_qos_t *qos,
...@@ -112,14 +112,14 @@ int esm_proc_dedicated_eps_bearer_context(unsigned int ueid, int pid, ...@@ -112,14 +112,14 @@ int esm_proc_dedicated_eps_bearer_context(unsigned int ueid, int pid,
LOG_FUNC_IN; LOG_FUNC_IN;
LOG_TRACE(INFO, "ESM-PROC - Dedicated EPS bearer context activation " LOG_TRACE(INFO, "ESM-PROC - Dedicated EPS bearer context activation "
"(ueid=%u, pid=%d)", ueid, pid); "(ueid=%u, pid=%d)", ctx->ueid, pid);
/* Assign new EPS bearer context */ /* Assign new EPS bearer context */
*ebi = esm_ebr_assign(ueid, ESM_EBI_UNASSIGNED); *ebi = esm_ebr_assign(ctx, ESM_EBI_UNASSIGNED);
if (*ebi != ESM_EBI_UNASSIGNED) { if (*ebi != ESM_EBI_UNASSIGNED) {
/* Create dedicated EPS bearer context */ /* Create dedicated EPS bearer context */
*default_ebi = esm_ebr_context_create(ueid, pid, *ebi, FALSE, qos, tft); *default_ebi = esm_ebr_context_create(ctx, pid, *ebi, FALSE, qos, tft);
if (*default_ebi == ESM_EBI_UNASSIGNED) { if (*default_ebi == ESM_EBI_UNASSIGNED) {
/* No resource available */ /* No resource available */
LOG_TRACE(WARNING, "ESM-PROC - Failed to create dedicated EPS " LOG_TRACE(WARNING, "ESM-PROC - Failed to create dedicated EPS "
...@@ -162,7 +162,7 @@ int esm_proc_dedicated_eps_bearer_context(unsigned int ueid, int pid, ...@@ -162,7 +162,7 @@ int esm_proc_dedicated_eps_bearer_context(unsigned int ueid, int pid,
** ** ** **
***************************************************************************/ ***************************************************************************/
int esm_proc_dedicated_eps_bearer_context_request(int is_standalone, int esm_proc_dedicated_eps_bearer_context_request(int is_standalone,
unsigned int ueid, int ebi, emm_data_context_t *ctx, int ebi,
OctetString *msg, int ue_triggered) OctetString *msg, int ue_triggered)
{ {
LOG_FUNC_IN; LOG_FUNC_IN;
...@@ -170,15 +170,15 @@ int esm_proc_dedicated_eps_bearer_context_request(int is_standalone, ...@@ -170,15 +170,15 @@ int esm_proc_dedicated_eps_bearer_context_request(int is_standalone,
int rc = RETURNok; int rc = RETURNok;
LOG_TRACE(INFO,"ESM-PROC - Initiate dedicated EPS bearer context " LOG_TRACE(INFO,"ESM-PROC - Initiate dedicated EPS bearer context "
"activation (ueid=%d, ebi=%d)", ueid, ebi); "activation (ueid=%d, ebi=%d)", ctx->ueid, ebi);
/* Send activate dedicated EPS bearer context request message and /* Send activate dedicated EPS bearer context request message and
* start timer T3485 */ * start timer T3485 */
rc = _dedicated_eps_bearer_activate(ueid, ebi, msg); rc = _dedicated_eps_bearer_activate(ctx, ebi, msg);
if (rc != RETURNerror) { if (rc != RETURNerror) {
/* Set the EPS bearer context state to ACTIVE PENDING */ /* Set the EPS bearer context state to ACTIVE PENDING */
rc = esm_ebr_set_status(ueid, ebi, ESM_EBR_ACTIVE_PENDING, ue_triggered); rc = esm_ebr_set_status(ctx, ebi, ESM_EBR_ACTIVE_PENDING, ue_triggered);
if (rc != RETURNok) { if (rc != RETURNok) {
/* The EPS bearer context was already in ACTIVE PENDING state */ /* The EPS bearer context was already in ACTIVE PENDING state */
LOG_TRACE(WARNING, "ESM-PROC - EBI %d was already ACTIVE PENDING", LOG_TRACE(WARNING, "ESM-PROC - EBI %d was already ACTIVE PENDING",
...@@ -211,7 +211,7 @@ int esm_proc_dedicated_eps_bearer_context_request(int is_standalone, ...@@ -211,7 +211,7 @@ int esm_proc_dedicated_eps_bearer_context_request(int is_standalone,
** Others: None ** ** Others: None **
** ** ** **
***************************************************************************/ ***************************************************************************/
int esm_proc_dedicated_eps_bearer_context_accept(unsigned int ueid, int ebi, int esm_proc_dedicated_eps_bearer_context_accept(emm_data_context_t *ctx, int ebi,
int *esm_cause) int *esm_cause)
{ {
LOG_FUNC_IN; LOG_FUNC_IN;
...@@ -219,13 +219,13 @@ int esm_proc_dedicated_eps_bearer_context_accept(unsigned int ueid, int ebi, ...@@ -219,13 +219,13 @@ int esm_proc_dedicated_eps_bearer_context_accept(unsigned int ueid, int ebi,
int rc; int rc;
LOG_TRACE(INFO, "ESM-PROC - Dedicated EPS bearer context activation " LOG_TRACE(INFO, "ESM-PROC - Dedicated EPS bearer context activation "
"accepted by the UE (ueid=%u, ebi=%d)", ueid, ebi); "accepted by the UE (ueid=%u, ebi=%d)", ctx->ueid, ebi);
/* Stop T3485 timer */ /* Stop T3485 timer */
rc = esm_ebr_stop_timer(ueid, ebi); rc = esm_ebr_stop_timer(ctx, ebi);
if (rc != RETURNerror) { if (rc != RETURNerror) {
/* Set the EPS bearer context state to ACTIVE */ /* Set the EPS bearer context state to ACTIVE */
rc = esm_ebr_set_status(ueid, ebi, ESM_EBR_ACTIVE, FALSE); rc = esm_ebr_set_status(ctx, ebi, ESM_EBR_ACTIVE, FALSE);
if (rc != RETURNok) { if (rc != RETURNok) {
/* The EPS bearer context was already in ACTIVE state */ /* The EPS bearer context was already in ACTIVE state */
LOG_TRACE(WARNING, "ESM-PROC - EBI %d was already ACTIVE", ebi); LOG_TRACE(WARNING, "ESM-PROC - EBI %d was already ACTIVE", ebi);
...@@ -262,22 +262,22 @@ int esm_proc_dedicated_eps_bearer_context_accept(unsigned int ueid, int ebi, ...@@ -262,22 +262,22 @@ int esm_proc_dedicated_eps_bearer_context_accept(unsigned int ueid, int ebi,
** Others: None ** ** Others: None **
** ** ** **
***************************************************************************/ ***************************************************************************/
int esm_proc_dedicated_eps_bearer_context_reject(unsigned int ueid, int ebi, int esm_proc_dedicated_eps_bearer_context_reject(emm_data_context_t *ctx, int ebi,
int *esm_cause) int *esm_cause)
{ {
LOG_FUNC_IN;
int rc; int rc;
LOG_FUNC_IN;
LOG_TRACE(WARNING, "ESM-PROC - Dedicated EPS bearer context activation " LOG_TRACE(WARNING, "ESM-PROC - Dedicated EPS bearer context activation "
"not accepted by the UE (ueid=%u, ebi=%d)", ueid, ebi); "not accepted by the UE (ueid=%u, ebi=%d)", ctx->ueid, ebi);
/* Stop T3485 timer if running */ /* Stop T3485 timer if running */
rc = esm_ebr_stop_timer(ueid, ebi); rc = esm_ebr_stop_timer(ctx, ebi);
if (rc != RETURNerror) { if (rc != RETURNerror) {
int pid, bid; int pid, bid;
/* Release the dedicated EPS bearer context and enter state INACTIVE */ /* Release the dedicated EPS bearer context and enter state INACTIVE */
rc = esm_proc_eps_bearer_context_deactivate(ueid, TRUE, ebi, rc = esm_proc_eps_bearer_context_deactivate(ctx, TRUE, ebi,
&pid, &bid, NULL); &pid, &bid, NULL);
if (rc != RETURNok) { if (rc != RETURNok) {
/* Failed to release the dedicated EPS bearer context */ /* Failed to release the dedicated EPS bearer context */
...@@ -558,7 +558,7 @@ static void *_dedicated_eps_bearer_activate_t3485_handler(void *args) ...@@ -558,7 +558,7 @@ static void *_dedicated_eps_bearer_activate_t3485_handler(void *args)
if (data->count < DEDICATED_EPS_BEARER_ACTIVATE_COUNTER_MAX) { if (data->count < DEDICATED_EPS_BEARER_ACTIVATE_COUNTER_MAX) {
/* Re-send activate dedicated EPS bearer context request message /* Re-send activate dedicated EPS bearer context request message
* to the UE */ * to the UE */
rc = _dedicated_eps_bearer_activate(data->ueid, data->ebi, &data->msg); rc = _dedicated_eps_bearer_activate(data->ctx, data->ebi, &data->msg);
} else { } else {
/* /*
* The maximum number of activate dedicated EPS bearer context request * The maximum number of activate dedicated EPS bearer context request
...@@ -566,12 +566,12 @@ static void *_dedicated_eps_bearer_activate_t3485_handler(void *args) ...@@ -566,12 +566,12 @@ static void *_dedicated_eps_bearer_activate_t3485_handler(void *args)
*/ */
int pid, bid; int pid, bid;
/* Release the dedicated EPS bearer context and enter state INACTIVE */ /* Release the dedicated EPS bearer context and enter state INACTIVE */
rc = esm_proc_eps_bearer_context_deactivate(data->ueid, TRUE, rc = esm_proc_eps_bearer_context_deactivate(data->ctx, TRUE,
data->ebi, &pid, &bid, data->ebi, &pid, &bid,
NULL); NULL);
if (rc != RETURNerror) { if (rc != RETURNerror) {
/* Stop timer T3485 */ /* Stop timer T3485 */
rc = esm_ebr_stop_timer(data->ueid, data->ebi); rc = esm_ebr_stop_timer(data->ctx, data->ebi);
} }
} }
...@@ -601,7 +601,7 @@ static void *_dedicated_eps_bearer_activate_t3485_handler(void *args) ...@@ -601,7 +601,7 @@ static void *_dedicated_eps_bearer_activate_t3485_handler(void *args)
** Others: T3485 ** ** Others: T3485 **
** ** ** **
***************************************************************************/ ***************************************************************************/
static int _dedicated_eps_bearer_activate(unsigned int ueid, int ebi, static int _dedicated_eps_bearer_activate(emm_data_context_t *ctx, int ebi,
const OctetString *msg) const OctetString *msg)
{ {
LOG_FUNC_IN; LOG_FUNC_IN;
...@@ -615,13 +615,14 @@ static int _dedicated_eps_bearer_activate(unsigned int ueid, int ebi, ...@@ -615,13 +615,14 @@ static int _dedicated_eps_bearer_activate(unsigned int ueid, int ebi,
*/ */
emm_esm_data_t *emm_esm = &emm_sap.u.emm_esm.u.data; emm_esm_data_t *emm_esm = &emm_sap.u.emm_esm.u.data;
emm_sap.primitive = EMMESM_UNITDATA_REQ; emm_sap.primitive = EMMESM_UNITDATA_REQ;
emm_sap.u.emm_esm.ueid = ueid; emm_sap.u.emm_esm.ueid = ctx->ueid;
emm_sap.u.emm_esm.ctx = ctx;
emm_esm->msg = *msg; emm_esm->msg = *msg;
rc = emm_sap_send(&emm_sap); rc = emm_sap_send(&emm_sap);
if (rc != RETURNerror) { if (rc != RETURNerror) {
/* Start T3485 retransmission timer */ /* Start T3485 retransmission timer */
rc = esm_ebr_start_timer(ueid, ebi, msg, T3485_DEFAULT_VALUE, rc = esm_ebr_start_timer(ctx, ebi, msg, T3485_DEFAULT_VALUE,
_dedicated_eps_bearer_activate_t3485_handler); _dedicated_eps_bearer_activate_t3485_handler);
} }
......
openair-cn/NAS/EURECOM-NAS/src/esm/DefaultEpsBearerContextActivation.c
View file @ 708013af
...@@ -75,7 +75,7 @@ static void *_default_eps_bearer_activate_t3485_handler(void *); ...@@ -75,7 +75,7 @@ static void *_default_eps_bearer_activate_t3485_handler(void *);
* retransmission counter */ * retransmission counter */
#define DEFAULT_EPS_BEARER_ACTIVATE_COUNTER_MAX 5 #define DEFAULT_EPS_BEARER_ACTIVATE_COUNTER_MAX 5
static int _default_eps_bearer_activate(unsigned int ueid, int ebi, static int _default_eps_bearer_activate(emm_data_context_t *ctx, int ebi,
const OctetString *msg); const OctetString *msg);
#endif // NAS_MME #endif // NAS_MME
...@@ -109,7 +109,7 @@ static int _default_eps_bearer_activate(unsigned int ueid, int ebi, ...@@ -109,7 +109,7 @@ static int _default_eps_bearer_activate(unsigned int ueid, int ebi,
** Others: None ** ** Others: None **
** ** ** **
***************************************************************************/ ***************************************************************************/
int esm_proc_default_eps_bearer_context(unsigned int ueid, int pid, int esm_proc_default_eps_bearer_context(emm_data_context_t *ctx, int pid,
unsigned int *ebi, unsigned int *ebi,
const esm_proc_qos_t *qos, const esm_proc_qos_t *qos,
int *esm_cause) int *esm_cause)
...@@ -117,14 +117,14 @@ int esm_proc_default_eps_bearer_context(unsigned int ueid, int pid, ...@@ -117,14 +117,14 @@ int esm_proc_default_eps_bearer_context(unsigned int ueid, int pid,
LOG_FUNC_IN; LOG_FUNC_IN;
LOG_TRACE(INFO, "ESM-PROC - Default EPS bearer context activation " LOG_TRACE(INFO, "ESM-PROC - Default EPS bearer context activation "
"(ueid=%u, pid=%d)", ueid, pid); "(ueid=%u, pid=%d)", ctx->ueid, pid);
/* Assign new EPS bearer context */ /* Assign new EPS bearer context */
*ebi = esm_ebr_assign(ueid, ESM_EBI_UNASSIGNED); *ebi = esm_ebr_assign(ctx, ESM_EBI_UNASSIGNED);
if (*ebi != ESM_EBI_UNASSIGNED) { if (*ebi != ESM_EBI_UNASSIGNED) {
/* Create default EPS bearer context */ /* Create default EPS bearer context */
*ebi = esm_ebr_context_create(ueid, pid, *ebi, TRUE, qos, NULL); *ebi = esm_ebr_context_create(ctx, pid, *ebi, TRUE, qos, NULL);
if (*ebi == ESM_EBI_UNASSIGNED) { if (*ebi == ESM_EBI_UNASSIGNED) {
/* No resource available */ /* No resource available */
LOG_TRACE(WARNING, "ESM-PROC - Failed to create new default EPS " LOG_TRACE(WARNING, "ESM-PROC - Failed to create new default EPS "
...@@ -170,25 +170,25 @@ int esm_proc_default_eps_bearer_context(unsigned int ueid, int pid, ...@@ -170,25 +170,25 @@ int esm_proc_default_eps_bearer_context(unsigned int ueid, int pid,
** ** ** **
***************************************************************************/ ***************************************************************************/
int esm_proc_default_eps_bearer_context_request(int is_standalone, int esm_proc_default_eps_bearer_context_request(int is_standalone,
unsigned int ueid, int ebi, emm_data_context_t *ctx, int ebi,
OctetString *msg, int ue_triggered) OctetString *msg, int ue_triggered)
{ {
LOG_FUNC_IN;
int rc = RETURNok; int rc = RETURNok;
LOG_FUNC_IN;
LOG_TRACE(INFO,"ESM-PROC - Initiate default EPS bearer context activation " LOG_TRACE(INFO,"ESM-PROC - Initiate default EPS bearer context activation "
"(ueid=%d, ebi=%d)", ueid, ebi); "(ueid=%u, ebi=%d)", ctx->ueid, ebi);
if (is_standalone) { if (is_standalone) {
/* Send activate default EPS bearer context request message and /* Send activate default EPS bearer context request message and
* start timer T3485 */ * start timer T3485 */
rc = _default_eps_bearer_activate(ueid, ebi, msg); rc = _default_eps_bearer_activate(ctx, ebi, msg);
} }
if (rc != RETURNerror) { if (rc != RETURNerror) {
/* Set the EPS bearer context state to ACTIVE PENDING */ /* Set the EPS bearer context state to ACTIVE PENDING */
rc = esm_ebr_set_status(ueid, ebi, ESM_EBR_ACTIVE_PENDING, ue_triggered); rc = esm_ebr_set_status(ctx, ebi, ESM_EBR_ACTIVE_PENDING, ue_triggered);
if (rc != RETURNok) { if (rc != RETURNok) {
/* The EPS bearer context was already in ACTIVE PENDING state */ /* The EPS bearer context was already in ACTIVE PENDING state */
LOG_TRACE(WARNING, "ESM-PROC - EBI %d was already ACTIVE PENDING", LOG_TRACE(WARNING, "ESM-PROC - EBI %d was already ACTIVE PENDING",
...@@ -221,7 +221,7 @@ int esm_proc_default_eps_bearer_context_request(int is_standalone, ...@@ -221,7 +221,7 @@ int esm_proc_default_eps_bearer_context_request(int is_standalone,
** Others: None ** ** Others: None **
** ** ** **
***************************************************************************/ ***************************************************************************/
int esm_proc_default_eps_bearer_context_accept(unsigned int ueid, int ebi, int esm_proc_default_eps_bearer_context_accept(emm_data_context_t *ctx, int ebi,
int *esm_cause) int *esm_cause)
{ {
LOG_FUNC_IN; LOG_FUNC_IN;
...@@ -229,13 +229,13 @@ int esm_proc_default_eps_bearer_context_accept(unsigned int ueid, int ebi, ...@@ -229,13 +229,13 @@ int esm_proc_default_eps_bearer_context_accept(unsigned int ueid, int ebi,
int rc; int rc;
LOG_TRACE(INFO, "ESM-PROC - Default EPS bearer context activation " LOG_TRACE(INFO, "ESM-PROC - Default EPS bearer context activation "
"accepted by the UE (ueid=%u, ebi=%d)", ueid, ebi); "accepted by the UE (ueid=%u, ebi=%d)", ctx->ueid, ebi);
/* Stop T3485 timer if running */ /* Stop T3485 timer if running */
rc = esm_ebr_stop_timer(ueid, ebi); rc = esm_ebr_stop_timer(ctx, ebi);
if (rc != RETURNerror) { if (rc != RETURNerror) {
/* Set the EPS bearer context state to ACTIVE */ /* Set the EPS bearer context state to ACTIVE */
rc = esm_ebr_set_status(ueid, ebi, ESM_EBR_ACTIVE, FALSE); rc = esm_ebr_set_status(ctx, ebi, ESM_EBR_ACTIVE, FALSE);
if (rc != RETURNok) { if (rc != RETURNok) {
/* The EPS bearer context was already in ACTIVE state */ /* The EPS bearer context was already in ACTIVE state */
LOG_TRACE(WARNING, "ESM-PROC - EBI %d was already ACTIVE", ebi); LOG_TRACE(WARNING, "ESM-PROC - EBI %d was already ACTIVE", ebi);
...@@ -268,7 +268,7 @@ int esm_proc_default_eps_bearer_context_accept(unsigned int ueid, int ebi, ...@@ -268,7 +268,7 @@ int esm_proc_default_eps_bearer_context_accept(unsigned int ueid, int ebi,
** Others: None ** ** Others: None **
** ** ** **
***************************************************************************/ ***************************************************************************/
int esm_proc_default_eps_bearer_context_reject(unsigned int ueid, int ebi, int esm_proc_default_eps_bearer_context_reject(emm_data_context_t *ctx, int ebi,
int *esm_cause) int *esm_cause)
{ {
LOG_FUNC_IN; LOG_FUNC_IN;
...@@ -276,14 +276,14 @@ int esm_proc_default_eps_bearer_context_reject(unsigned int ueid, int ebi, ...@@ -276,14 +276,14 @@ int esm_proc_default_eps_bearer_context_reject(unsigned int ueid, int ebi,
int rc; int rc;
LOG_TRACE(WARNING, "ESM-PROC - Default EPS bearer context activation " LOG_TRACE(WARNING, "ESM-PROC - Default EPS bearer context activation "
"not accepted by the UE (ueid=%u, ebi=%d)", ueid, ebi); "not accepted by the UE (ueid=%u, ebi=%d)", ctx->ueid, ebi);
/* Stop T3485 timer if running */ /* Stop T3485 timer if running */
rc = esm_ebr_stop_timer(ueid, ebi); rc = esm_ebr_stop_timer(ctx, ebi);
if (rc != RETURNerror) { if (rc != RETURNerror) {
int pid, bid; int pid, bid;
/* Release the default EPS bearer context and enter state INACTIVE */ /* Release the default EPS bearer context and enter state INACTIVE */
rc = esm_proc_eps_bearer_context_deactivate(ueid, TRUE, ebi, rc = esm_proc_eps_bearer_context_deactivate(ctx, TRUE, ebi,
&pid, &bid, NULL); &pid, &bid, NULL);
if (rc != RETURNok) { if (rc != RETURNok) {
/* Failed to release the default EPS bearer context */ /* Failed to release the default EPS bearer context */
...@@ -318,23 +318,23 @@ int esm_proc_default_eps_bearer_context_reject(unsigned int ueid, int ebi, ...@@ -318,23 +318,23 @@ int esm_proc_default_eps_bearer_context_reject(unsigned int ueid, int ebi,
** Others: None ** ** Others: None **
** ** ** **
***************************************************************************/ ***************************************************************************/
int esm_proc_default_eps_bearer_context_failure(unsigned int ueid) int esm_proc_default_eps_bearer_context_failure(emm_data_context_t *ctx)
{ {
LOG_FUNC_IN;
int rc = RETURNerror; int rc = RETURNerror;
int pid; int pid;
LOG_FUNC_IN;
LOG_TRACE(WARNING, "ESM-PROC - Default EPS bearer context activation " LOG_TRACE(WARNING, "ESM-PROC - Default EPS bearer context activation "
"failure (ueid=%u)", ueid); "failure (ueid=%u)", ctx->ueid);
/* Get the EPS bearer identity of the EPS bearer context which is still /* Get the EPS bearer identity of the EPS bearer context which is still
* pending in the active pending state */ * pending in the active pending state */
int ebi = esm_ebr_get_pending_ebi(ueid, ESM_EBR_ACTIVE_PENDING); int ebi = esm_ebr_get_pending_ebi(ctx, ESM_EBR_ACTIVE_PENDING);
if (ebi != ESM_EBI_UNASSIGNED) { if (ebi != ESM_EBI_UNASSIGNED) {
int bid; int bid;
/* Release the default EPS bearer context and enter state INACTIVE */ /* Release the default EPS bearer context and enter state INACTIVE */
rc = esm_proc_eps_bearer_context_deactivate(ueid, TRUE, ebi, rc = esm_proc_eps_bearer_context_deactivate(ctx, TRUE, ebi,
&pid, &bid, NULL); &pid, &bid, NULL);
} }
...@@ -680,7 +680,7 @@ static void *_default_eps_bearer_activate_t3485_handler(void *args) ...@@ -680,7 +680,7 @@ static void *_default_eps_bearer_activate_t3485_handler(void *args)
if (data->count < DEFAULT_EPS_BEARER_ACTIVATE_COUNTER_MAX) { if (data->count < DEFAULT_EPS_BEARER_ACTIVATE_COUNTER_MAX) {
/* Re-send activate default EPS bearer context request message /* Re-send activate default EPS bearer context request message
* to the UE */ * to the UE */
rc = _default_eps_bearer_activate(data->ueid, data->ebi, &data->msg); rc = _default_eps_bearer_activate(data->ctx, data->ebi, &data->msg);
} else { } else {
/* /*
* The maximum number of activate default EPS bearer context request * The maximum number of activate default EPS bearer context request
...@@ -688,12 +688,12 @@ static void *_default_eps_bearer_activate_t3485_handler(void *args) ...@@ -688,12 +688,12 @@ static void *_default_eps_bearer_activate_t3485_handler(void *args)
*/ */
int pid, bid; int pid, bid;
/* Release the default EPS bearer context and enter state INACTIVE */ /* Release the default EPS bearer context and enter state INACTIVE */
rc = esm_proc_eps_bearer_context_deactivate(data->ueid, TRUE, rc = esm_proc_eps_bearer_context_deactivate(data->ctx, TRUE,
data->ebi, &pid, &bid, data->ebi, &pid, &bid,
NULL); NULL);
if (rc != RETURNerror) { if (rc != RETURNerror) {
/* Stop timer T3485 */ /* Stop timer T3485 */
rc = esm_ebr_stop_timer(data->ueid, data->ebi); rc = esm_ebr_stop_timer(data->ctx, data->ebi);
} }
} }
...@@ -723,7 +723,7 @@ static void *_default_eps_bearer_activate_t3485_handler(void *args) ...@@ -723,7 +723,7 @@ static void *_default_eps_bearer_activate_t3485_handler(void *args)
** Others: T3485 ** ** Others: T3485 **
** ** ** **
***************************************************************************/ ***************************************************************************/
static int _default_eps_bearer_activate(unsigned int ueid, int ebi, static int _default_eps_bearer_activate(emm_data_context_t *ctx, int ebi,
const OctetString *msg) const OctetString *msg)
{ {
LOG_FUNC_IN; LOG_FUNC_IN;
...@@ -737,13 +737,14 @@ static int _default_eps_bearer_activate(unsigned int ueid, int ebi, ...@@ -737,13 +737,14 @@ static int _default_eps_bearer_activate(unsigned int ueid, int ebi,
*/ */
emm_esm_data_t *emm_esm = &emm_sap.u.emm_esm.u.data; emm_esm_data_t *emm_esm = &emm_sap.u.emm_esm.u.data;
emm_sap.primitive = EMMESM_UNITDATA_REQ; emm_sap.primitive = EMMESM_UNITDATA_REQ;
emm_sap.u.emm_esm.ueid = ueid; emm_sap.u.emm_esm.ueid = ctx->ueid;
emm_sap.u.emm_esm.ctx = ctx;
emm_esm->msg = *msg; emm_esm->msg = *msg;
rc = emm_sap_send(&emm_sap); rc = emm_sap_send(&emm_sap);
if (rc != RETURNerror) { if (rc != RETURNerror) {
/* Start T3485 retransmission timer */ /* Start T3485 retransmission timer */
rc = esm_ebr_start_timer(ueid, ebi, msg, T3485_DEFAULT_VALUE, rc = esm_ebr_start_timer(ctx, ebi, msg, T3485_DEFAULT_VALUE,
_default_eps_bearer_activate_t3485_handler); _default_eps_bearer_activate_t3485_handler);
} }
......
openair-cn/NAS/EURECOM-NAS/src/esm/EsmStatusHdl.c
View file @ 708013af
...@@ -73,7 +73,7 @@ Description Defines the ESM status procedure executed by the Non-Access ...@@ -73,7 +73,7 @@ Description Defines the ESM status procedure executed by the Non-Access
***************************************************************************/ ***************************************************************************/
int esm_proc_status_ind( int esm_proc_status_ind(
#ifdef NAS_MME #ifdef NAS_MME
unsigned int ueid, emm_data_context_t *ctx,
#endif #endif
int pti, int ebi, int *esm_cause) int pti, int ebi, int *esm_cause)
{ {
...@@ -148,7 +148,7 @@ int esm_proc_status_ind( ...@@ -148,7 +148,7 @@ int esm_proc_status_ind(
***************************************************************************/ ***************************************************************************/
int esm_proc_status(int is_standalone, int esm_proc_status(int is_standalone,
#ifdef NAS_MME #ifdef NAS_MME
unsigned int ueid, emm_data_context_t *ctx,
#endif #endif
int ebi, OctetString *msg, int ebi, OctetString *msg,
int ue_triggered) int ue_triggered)
...@@ -168,7 +168,8 @@ int esm_proc_status(int is_standalone, ...@@ -168,7 +168,8 @@ int esm_proc_status(int is_standalone,
emm_sap.u.emm_esm.ueid = 0; emm_sap.u.emm_esm.ueid = 0;
#endif #endif
#ifdef NAS_MME #ifdef NAS_MME
emm_sap.u.emm_esm.ueid = ueid; emm_sap.u.emm_esm.ueid = ctx->ueid;
emm_sap.u.emm_esm.ctx = ctx;
#endif #endif
emm_sap.u.emm_esm.u.data.msg.length = msg->length; emm_sap.u.emm_esm.u.data.msg.length = msg->length;
emm_sap.u.emm_esm.u.data.msg.value = msg->value; emm_sap.u.emm_esm.u.data.msg.value = msg->value;
......
openair-cn/NAS/EURECOM-NAS/src/esm/PdnDisconnect.c
View file @ 708013af
...@@ -44,7 +44,7 @@ Description Defines the PDN disconnect ESM procedure executed by the ...@@ -44,7 +44,7 @@ Description Defines the PDN disconnect ESM procedure executed by the
/****************************************************************************/ /****************************************************************************/
#ifdef NAS_MME #ifdef NAS_MME
extern int _pdn_connectivity_delete(unsigned int ueid, int pid); extern int _pdn_connectivity_delete(emm_data_context_t *ctx, int pid);
#endif #endif
/****************************************************************************/ /****************************************************************************/
...@@ -81,7 +81,7 @@ static void *_pdn_disconnect_t3492_handler(void *); ...@@ -81,7 +81,7 @@ static void *_pdn_disconnect_t3492_handler(void *);
/* /*
* PDN disconnection handlers * PDN disconnection handlers
*/ */
static int _pdn_disconnect_get_pid(unsigned int ueid, int pti); static int _pdn_disconnect_get_pid(esm_data_context_t *ctx, int pti);
#endif // NAS_MME #endif // NAS_MME
...@@ -368,36 +368,30 @@ int esm_proc_pdn_disconnect_reject(int pti, int *esm_cause) ...@@ -368,36 +368,30 @@ int esm_proc_pdn_disconnect_reject(int pti, int *esm_cause)
** Others: None ** ** Others: None **
** ** ** **
***************************************************************************/ ***************************************************************************/
int esm_proc_pdn_disconnect_request(unsigned int ueid, int pti, int *esm_cause) int esm_proc_pdn_disconnect_request(emm_data_context_t *ctx, int pti, int *esm_cause)
{ {
LOG_FUNC_IN;
int pid = RETURNerror; int pid = RETURNerror;
LOG_TRACE(INFO, "ESM-PROC - PDN disconnect requested by the UE " LOG_FUNC_IN;
"(ueid=%d, pti=%d)", ueid, pti);
if (ueid < ESM_DATA_NB_UE_MAX) { LOG_TRACE(INFO, "ESM-PROC - PDN disconnect requested by the UE "
/* Get UE's ESM context */ "(ueid=%d, pti=%d)", ctx->ueid, pti);
esm_data_context_t *ctx = _esm_data.ctx[ueid];
if (_esm_data.ctx[ueid] == NULL) { /* Get UE's ESM context */
LOG_TRACE(ERROR, "ESM-PROC - No ESM context exists"); if (ctx->esm_data_ctx.n_pdns > 1) {
/* Get the identifier of the PDN connection entry assigned to the
* procedure transaction identity */
pid = _pdn_disconnect_get_pid(&ctx->esm_data_ctx, pti);
if (pid < 0) {
LOG_TRACE(ERROR, "ESM-PROC - No PDN connection found (pti=%d)",
pti);
*esm_cause = ESM_CAUSE_PROTOCOL_ERROR; *esm_cause = ESM_CAUSE_PROTOCOL_ERROR;
} else if (ctx->n_pdns > 1) { LOG_FUNC_RETURN (RETURNerror);
/* Get the identifier of the PDN connection entry assigned to the
* procedure transaction identity */
pid = _pdn_disconnect_get_pid(ueid, pti);
if (pid < 0) {
LOG_TRACE(ERROR, "ESM-PROC - No PDN connection found (pti=%d)",
pti);
*esm_cause = ESM_CAUSE_PROTOCOL_ERROR;
LOG_FUNC_RETURN (RETURNerror);
}
} else {
/* Attempt to disconnect from the last PDN disconnection
* is not allowed */
*esm_cause = ESM_CAUSE_LAST_PDN_DISCONNECTION_NOT_ALLOWED;
} }
} else {
/* Attempt to disconnect from the last PDN disconnection
* is not allowed */
*esm_cause = ESM_CAUSE_LAST_PDN_DISCONNECTION_NOT_ALLOWED;
} }
LOG_FUNC_RETURN(pid); LOG_FUNC_RETURN(pid);
...@@ -425,18 +419,18 @@ int esm_proc_pdn_disconnect_request(unsigned int ueid, int pti, int *esm_cause) ...@@ -425,18 +419,18 @@ int esm_proc_pdn_disconnect_request(unsigned int ueid, int pti, int *esm_cause)
** Others: None ** ** Others: None **
** ** ** **
***************************************************************************/ ***************************************************************************/
int esm_proc_pdn_disconnect_accept(unsigned int ueid, int pid, int *esm_cause) int esm_proc_pdn_disconnect_accept(emm_data_context_t *ctx, int pid, int *esm_cause)
{ {
LOG_FUNC_IN; LOG_FUNC_IN;
LOG_TRACE(INFO, "ESM-PROC - PDN disconnect accepted by the UE " LOG_TRACE(INFO, "ESM-PROC - PDN disconnect accepted by the UE "
"(ueid=%d, pid=%d)", ueid, pid); "(ueid=%d, pid=%d)", ctx->ueid, pid);
/* Release the connectivity with the requested PDN */ /* Release the connectivity with the requested PDN */
int rc = mme_api_unsubscribe(NULL); int rc = mme_api_unsubscribe(NULL);
if (rc != RETURNerror) { if (rc != RETURNerror) {
/* Delete the PDN connection entry */ /* Delete the PDN connection entry */
int pti = _pdn_connectivity_delete(ueid, pid); int pti = _pdn_connectivity_delete(ctx, pid);
if (pti != ESM_PT_UNASSIGNED) { if (pti != ESM_PT_UNASSIGNED) {
LOG_FUNC_RETURN (RETURNok); LOG_FUNC_RETURN (RETURNok);
} }
...@@ -470,7 +464,7 @@ int esm_proc_pdn_disconnect_accept(unsigned int ueid, int pid, int *esm_cause) ...@@ -470,7 +464,7 @@ int esm_proc_pdn_disconnect_accept(unsigned int ueid, int pid, int *esm_cause)
** Others: None ** ** Others: None **
** ** ** **
***************************************************************************/ ***************************************************************************/
int esm_proc_pdn_disconnect_reject(int is_standalone, unsigned int ueid, int esm_proc_pdn_disconnect_reject(int is_standalone, emm_data_context_t *ctx,
int ebi, OctetString *msg, int ue_triggered) int ebi, OctetString *msg, int ue_triggered)
{ {
LOG_FUNC_IN; LOG_FUNC_IN;
...@@ -479,13 +473,14 @@ int esm_proc_pdn_disconnect_reject(int is_standalone, unsigned int ueid, ...@@ -479,13 +473,14 @@ int esm_proc_pdn_disconnect_reject(int is_standalone, unsigned int ueid,
emm_sap_t emm_sap; emm_sap_t emm_sap;
LOG_TRACE(WARNING, "ESM-PROC - PDN disconnect not accepted by the network " LOG_TRACE(WARNING, "ESM-PROC - PDN disconnect not accepted by the network "
"(ueid=%d)", ueid); "(ueid=%d)", ctx->ueid);
/* /*
* Notity EMM that ESM PDU has to be forwarded to lower layers * Notity EMM that ESM PDU has to be forwarded to lower layers
*/ */
emm_sap.primitive = EMMESM_UNITDATA_REQ; emm_sap.primitive = EMMESM_UNITDATA_REQ;
emm_sap.u.emm_esm.ueid = ueid; emm_sap.u.emm_esm.ueid = ctx->ueid;
emm_sap.u.emm_esm.ctx = ctx;
emm_sap.u.emm_esm.u.data.msg.length = msg->length; emm_sap.u.emm_esm.u.data.msg.length = msg->length;
emm_sap.u.emm_esm.u.data.msg.value = msg->value; emm_sap.u.emm_esm.u.data.msg.value = msg->value;
rc = emm_sap_send(&emm_sap); rc = emm_sap_send(&emm_sap);
...@@ -670,15 +665,15 @@ static int _pdn_disconnect_get_default_ebi(int pti) ...@@ -670,15 +665,15 @@ static int _pdn_disconnect_get_default_ebi(int pti)
** Others: None ** ** Others: None **
** ** ** **
***************************************************************************/ ***************************************************************************/
static int _pdn_disconnect_get_pid(unsigned int ueid, int pti) static int _pdn_disconnect_get_pid(esm_data_context_t *ctx, int pti)
{ {
int i = ESM_DATA_PDN_MAX; int i = ESM_DATA_PDN_MAX;
if ( (ueid < ESM_DATA_NB_UE_MAX) && (_esm_data.ctx[ueid] != NULL) ) { if (ctx != NULL) {
for (i = 0; i < ESM_DATA_PDN_MAX; i++) { for (i = 0; i < ESM_DATA_PDN_MAX; i++) {
if ( (_esm_data.ctx[ueid]->pdn[i].pid != -1) && if ( (ctx->pdn[i].pid != -1) &&
(_esm_data.ctx[ueid]->pdn[i].data != NULL) ) { (ctx->pdn[i].data != NULL) ) {
if (_esm_data.ctx[ueid]->pdn[i].data->pti != pti) { if (ctx->pdn[i].data->pti != pti) {
continue; continue;
} }
/* PDN entry found */ /* PDN entry found */
...@@ -688,6 +683,6 @@ static int _pdn_disconnect_get_pid(unsigned int ueid, int pti) ...@@ -688,6 +683,6 @@ static int _pdn_disconnect_get_pid(unsigned int ueid, int pti)
} }
/* Return the identifier of the PDN connection */ /* Return the identifier of the PDN connection */
return (_esm_data.ctx[ueid]->pdn[i].pid); return (ctx->pdn[i].pid);
} }
#endif // NAS_MME #endif // NAS_MME
openair-cn/NAS/EURECOM-NAS/src/esm/esmData.h
View file @ 708013af
...@@ -18,17 +18,22 @@ Description Defines internal private data handled by EPS Session ...@@ -18,17 +18,22 @@ Description Defines internal private data handled by EPS Session
Management sublayer. Management sublayer.
*****************************************************************************/ *****************************************************************************/
#ifndef __ESMDATA_H__ #include <stdio.h> // sprintf
#define __ESMDATA_H__
#include "networkDef.h" #include "networkDef.h"
#include "OctetString.h" #include "OctetString.h"
#include "EpsBearerIdentity.h"
#ifdef NAS_MME #ifdef NAS_MME
#include "mme_api.h" #include "mme_api.h"
#endif #endif
#include <stdio.h> // sprintf #if defined(EPC_BUILD)
# include "tree.h"
#endif
#ifndef __ESMDATA_H__
#define __ESMDATA_H__
/****************************************************************************/ /****************************************************************************/
/********************* G L O B A L C O N S T A N T S *******************/ /********************* G L O B A L C O N S T A N T S *******************/
...@@ -41,6 +46,67 @@ Description Defines internal private data handled by EPS Session ...@@ -41,6 +46,67 @@ Description Defines internal private data handled by EPS Session
/************************ G L O B A L T Y P E S ************************/ /************************ G L O B A L T Y P E S ************************/
/****************************************************************************/ /****************************************************************************/
/*
* Minimal and maximal value of an EPS bearer identity:
* The EPS Bearer Identity (EBI) identifies a message flow
*/
#define ESM_EBI_MIN (EPS_BEARER_IDENTITY_FIRST)
#define ESM_EBI_MAX (EPS_BEARER_IDENTITY_LAST)
/* EPS bearer context states */
typedef enum {
ESM_EBR_INACTIVE, /* No EPS bearer context exists */
ESM_EBR_ACTIVE, /* The EPS bearer context is active,
* in the UE, in the network */
#ifdef NAS_MME
ESM_EBR_INACTIVE_PENDING, /* The network has initiated an EPS bearer
* context deactivation towards the UE */
ESM_EBR_MODIFY_PENDING, /* The network has initiated an EPS bearer
* context modification towards the UE */
ESM_EBR_ACTIVE_PENDING, /* The network has initiated an EPS bearer
* context activation towards the UE */
#endif
ESM_EBR_STATE_MAX
} esm_ebr_state;
#ifdef NAS_MME
/* ESM message timer retransmission data */
typedef struct {
void *ctx;
unsigned int ueid; /* Lower layers UE identifier */
unsigned int ebi; /* EPS bearer identity */
unsigned int count; /* Retransmission counter */
OctetString msg; /* Encoded ESM message to re-transmit */
} esm_ebr_timer_data_t;
#endif
/*
* -----------------------
* EPS bearer context data
* -----------------------
*/
typedef struct {
unsigned char ebi; /* EPS bearer identity */
esm_ebr_state status; /* EPS bearer context status */
#ifdef NAS_UE
int is_default_ebr; /* TRUE if the bearer context is associated
* to a default EPS bearer */
char cid; /* Identifier of the PDN context the EPS
* bearer context has been assigned to */
#endif
#ifdef NAS_MME
struct nas_timer_t timer; /* Retransmission timer */
esm_ebr_timer_data_t *args; /* Retransmission timer parameters data */
#endif
} esm_ebr_context_t;
typedef struct {
unsigned char index; /* Index of the next EPS bearer context
* identity to be used */
#define ESM_EBR_DATA_SIZE (ESM_EBI_MAX - ESM_EBI_MIN + 1)
esm_ebr_context_t *context[ESM_EBR_DATA_SIZE + 1];
} esm_ebr_data_t;
/* /*
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* Structure of data handled by EPS Session Management sublayer in the UE * Structure of data handled by EPS Session Management sublayer in the UE
...@@ -101,7 +167,9 @@ typedef struct { ...@@ -101,7 +167,9 @@ typedef struct {
* fault EPS bearer. Several dedicated EPS bearers may exist within * fault EPS bearer. Several dedicated EPS bearers may exist within
* a PDN connection. * a PDN connection.
*/ */
typedef struct { typedef struct esm_data_context_s {
unsigned int ue_id;
int n_ebrs; /* Total number of active EPS bearer contexts */ int n_ebrs; /* Total number of active EPS bearer contexts */
int n_pdns; /* Number of active PDN connections */ int n_pdns; /* Number of active PDN connections */
int emergency; /* Indicates whether a PDN connection for emergency int emergency; /* Indicates whether a PDN connection for emergency
...@@ -114,6 +182,8 @@ typedef struct { ...@@ -114,6 +182,8 @@ typedef struct {
* connection is in progress */ * connection is in progress */
esm_pdn_t *data; /* Active PDN connection data */ esm_pdn_t *data; /* Active PDN connection data */
} pdn[ESM_DATA_PDN_MAX+1]; } pdn[ESM_DATA_PDN_MAX+1];
esm_ebr_data_t ebr;
} esm_data_context_t; } esm_data_context_t;
/* /*
...@@ -149,11 +219,26 @@ typedef struct { ...@@ -149,11 +219,26 @@ typedef struct {
* ESM contexts * ESM contexts
* ------------ * ------------
*/ */
#define ESM_DATA_NB_UE_MAX (MME_API_NB_UE_MAX + 1) # if defined(EPC_BUILD)
/* Use a tree for ue data context within MME */
RB_HEAD(esm_data_context_map, esm_data_context_s) ctx_map;
# else
# define ESM_DATA_NB_UE_MAX (MME_API_NB_UE_MAX + 1)
esm_data_context_t *ctx[ESM_DATA_NB_UE_MAX]; esm_data_context_t *ctx[ESM_DATA_NB_UE_MAX];
# endif
} esm_data_t; } esm_data_t;
# if defined(EPC_BUILD)
struct esm_data_context_s *esm_data_context_get(
esm_data_t *esm_data, unsigned int _ueid);
struct esm_data_context_s *esm_data_context_remove(
esm_data_t *esm_data, struct esm_data_context_s *elm);
void esm_data_context_add(esm_data_t *esm_data, struct esm_data_context_s *elm);
# endif
#endif //NAS_MME #endif //NAS_MME
/****************************************************************************/ /****************************************************************************/
......
openair-cn/NAS/EURECOM-NAS/src/esm/esm_ebr.h
View file @ 708013af
...@@ -28,7 +28,6 @@ Description Defines functions used to handle state of EPS bearer contexts ...@@ -28,7 +28,6 @@ Description Defines functions used to handle state of EPS bearer contexts
#endif #endif
#include "nas_timer.h" #include "nas_timer.h"
#include "EpsBearerIdentity.h"
/****************************************************************************/ /****************************************************************************/
/********************* G L O B A L C O N S T A N T S *******************/ /********************* G L O B A L C O N S T A N T S *******************/
...@@ -41,32 +40,6 @@ Description Defines functions used to handle state of EPS bearer contexts ...@@ -41,32 +40,6 @@ Description Defines functions used to handle state of EPS bearer contexts
/************************ G L O B A L T Y P E S ************************/ /************************ G L O B A L T Y P E S ************************/
/****************************************************************************/ /****************************************************************************/
/* EPS bearer context states */
typedef enum {
ESM_EBR_INACTIVE, /* No EPS bearer context exists */
ESM_EBR_ACTIVE, /* The EPS bearer context is active,
* in the UE, in the network */
#ifdef NAS_MME
ESM_EBR_INACTIVE_PENDING, /* The network has initiated an EPS bearer
* context deactivation towards the UE */
ESM_EBR_MODIFY_PENDING, /* The network has initiated an EPS bearer
* context modification towards the UE */
ESM_EBR_ACTIVE_PENDING, /* The network has initiated an EPS bearer
* context activation towards the UE */
#endif
ESM_EBR_STATE_MAX
} esm_ebr_state;
#ifdef NAS_MME
/* ESM message timer retransmission data */
typedef struct {
unsigned int ueid; /* Lower layers UE identifier */
unsigned int ebi; /* EPS bearer identity */
unsigned int count; /* Retransmission counter */
OctetString msg; /* Encoded ESM message to re-transmit */
} esm_ebr_timer_data_t;
#endif
/****************************************************************************/ /****************************************************************************/
/******************** G L O B A L V A R I A B L E S ********************/ /******************** G L O B A L V A R I A B L E S ********************/
/****************************************************************************/ /****************************************************************************/
...@@ -90,20 +63,20 @@ int esm_ebr_is_not_in_use(int ebi); ...@@ -90,20 +63,20 @@ int esm_ebr_is_not_in_use(int ebi);
#ifdef NAS_MME #ifdef NAS_MME
void esm_ebr_initialize(void); void esm_ebr_initialize(void);
int esm_ebr_assign(unsigned int ueid, int ebi); int esm_ebr_assign(emm_data_context_t *ctx, int ebi);
int esm_ebr_release(unsigned int ueid, int ebi); int esm_ebr_release(emm_data_context_t *ctx, int ebi);
int esm_ebr_start_timer(unsigned int ueid, int ebi, const OctetString *msg, int esm_ebr_start_timer(emm_data_context_t *ctx, int ebi, const OctetString *msg,
long sec, nas_timer_callback_t cb); long sec, nas_timer_callback_t cb);
int esm_ebr_stop_timer(unsigned int ueid, int ebi); int esm_ebr_stop_timer(emm_data_context_t *ctx, int ebi);
int esm_ebr_get_pending_ebi(unsigned int ueid, esm_ebr_state status); int esm_ebr_get_pending_ebi(emm_data_context_t *ctx, esm_ebr_state status);
int esm_ebr_set_status(unsigned int ueid, int ebi, esm_ebr_state status, int esm_ebr_set_status(emm_data_context_t *ctx, int ebi, esm_ebr_state status,
int ue_requested); int ue_requested);
esm_ebr_state esm_ebr_get_status(unsigned int ueid, int ebi); esm_ebr_state esm_ebr_get_status(emm_data_context_t *ctx, int ebi);
int esm_ebr_is_not_in_use(unsigned int ueid, int ebi); int esm_ebr_is_not_in_use(emm_data_context_t *ctx, int ebi);
#endif #endif
#endif /* __ESM_EBR_H__*/ #endif /* __ESM_EBR_H__*/
openair-cn/NAS/EURECOM-NAS/src/esm/esm_ebr_context.c
View file @ 708013af
...@@ -17,18 +17,22 @@ Author Frederic Maurel ...@@ -17,18 +17,22 @@ Author Frederic Maurel
Description Defines functions used to handle EPS bearer contexts. Description Defines functions used to handle EPS bearer contexts.
*****************************************************************************/ *****************************************************************************/
#include <stdlib.h> // malloc, free
#include <string.h> // memset
#include "esm_ebr_context.h"
#include "commonDef.h" #include "commonDef.h"
#include "nas_log.h" #include "nas_log.h"
#include "esmData.h" #include "emmData.h"
#include "esm_ebr.h" #include "esm_ebr.h"
#include "esm_ebr_context.h"
#include "emm_sap.h" #include "emm_sap.h"
#include <stdlib.h> // malloc, free #if defined(ENABLE_ITTI)
#include <string.h> // memset # include "assertions.h"
#endif
/****************************************************************************/ /****************************************************************************/
/**************** E X T E R N A L D E F I N I T I O N S ****************/ /**************** E X T E R N A L D E F I N I T I O N S ****************/
...@@ -75,48 +79,53 @@ static int _esm_ebr_context_check_precedence(const network_tft_t *, ...@@ -75,48 +79,53 @@ static int _esm_ebr_context_check_precedence(const network_tft_t *,
***************************************************************************/ ***************************************************************************/
int esm_ebr_context_create( int esm_ebr_context_create(
#ifdef NAS_MME #ifdef NAS_MME
unsigned int ueid, emm_data_context_t *ctx,
#endif #endif
int pid, int ebi, int is_default, int pid, int ebi, int is_default,
const network_qos_t *qos, const network_tft_t *tft) const network_qos_t *qos, const network_tft_t *tft)
{ {
LOG_FUNC_IN; int bid;
esm_data_context_t *esm_ctx;
esm_pdn_t *pdn = NULL;
esm_data_context_t *ctx; LOG_FUNC_IN;
#ifdef NAS_UE #ifdef NAS_UE
ctx = &_esm_data; esm_ctx = &_esm_data;
#endif #endif
#ifdef NAS_MME #ifdef NAS_MME
# if defined(EPC_BUILD)
esm_ctx = &ctx->esm_data_ctx;
# else
if (ueid < ESM_DATA_NB_UE_MAX) { if (ueid < ESM_DATA_NB_UE_MAX) {
ctx = _esm_data.ctx[ueid]; ctx = _esm_data.ctx[ueid];
} else { } else {
LOG_FUNC_RETURN (ESM_EBI_UNASSIGNED); LOG_FUNC_RETURN (ESM_EBI_UNASSIGNED);
} }
# endif
#endif #endif
int bid = ESM_DATA_EPS_BEARER_MAX; bid = ESM_DATA_EPS_BEARER_MAX;
esm_pdn_t *pdn = NULL;
LOG_TRACE(INFO, "ESM-PROC - Create new %s EPS bearer context (ebi=%d) " LOG_TRACE(INFO, "ESM-PROC - Create new %s EPS bearer context (ebi=%d) "
"for PDN connection (pid=%d)", "for PDN connection (pid=%d)",
(is_default)? "default" : "dedicated", ebi, pid); (is_default)? "default" : "dedicated", ebi, pid);
if (pid < ESM_DATA_PDN_MAX) { if (pid < ESM_DATA_PDN_MAX) {
if (pid != ctx->pdn[pid].pid) { if (pid != esm_ctx->pdn[pid].pid) {
LOG_TRACE(ERROR, "ESM-PROC - PDN connection identifier %d is " LOG_TRACE(ERROR, "ESM-PROC - PDN connection identifier %d is "
"not valid", pid); "not valid", pid);
} else if (ctx->pdn[pid].data == NULL) { } else if (esm_ctx->pdn[pid].data == NULL) {
LOG_TRACE(ERROR, "ESM-PROC - PDN connection %d has not been " LOG_TRACE(ERROR, "ESM-PROC - PDN connection %d has not been "
"allocated", pid); "allocated", pid);
} }
/* Check the total number of active EPS bearers */ /* Check the total number of active EPS bearers */
else if (ctx->n_ebrs > ESM_DATA_EPS_BEARER_TOTAL) { else if (esm_ctx->n_ebrs > ESM_DATA_EPS_BEARER_TOTAL) {
LOG_TRACE(WARNING, "ESM-PROC - The total number of active EPS" LOG_TRACE(WARNING, "ESM-PROC - The total number of active EPS"
"bearers is exeeded"); "bearers is exeeded");
} else { } else {
/* Get the PDN connection entry */ /* Get the PDN connection entry */
pdn = ctx->pdn[pid].data; pdn = esm_ctx->pdn[pid].data;
if (is_default) { if (is_default) {
/* Default EPS bearer entry is defined at index 0 */ /* Default EPS bearer entry is defined at index 0 */
bid = 0; bid = 0;
...@@ -143,7 +152,7 @@ int esm_ebr_context_create( ...@@ -143,7 +152,7 @@ int esm_ebr_context_create(
if (ebr != NULL) { if (ebr != NULL) {
memset(ebr, 0 , sizeof(esm_bearer_t)); memset(ebr, 0 , sizeof(esm_bearer_t));
/* Increment the total number of active EPS bearers */ /* Increment the total number of active EPS bearers */
ctx->n_ebrs += 1; esm_ctx->n_ebrs += 1;
/* Increment the number of EPS bearer for this PDN connection */ /* Increment the number of EPS bearer for this PDN connection */
pdn->n_bearers += 1; pdn->n_bearers += 1;
/* Setup the EPS bearer data */ /* Setup the EPS bearer data */
...@@ -169,10 +178,10 @@ int esm_ebr_context_create( ...@@ -169,10 +178,10 @@ int esm_ebr_context_create(
if (is_default) { if (is_default) {
/* Set the PDN connection activation indicator */ /* Set the PDN connection activation indicator */
ctx->pdn[pid].is_active = TRUE; esm_ctx->pdn[pid].is_active = TRUE;
/* Update the emergency bearer services indicator */ /* Update the emergency bearer services indicator */
if (pdn->is_emergency) { if (pdn->is_emergency) {
ctx->emergency = TRUE; esm_ctx->emergency = TRUE;
} }
} }
...@@ -210,28 +219,32 @@ int esm_ebr_context_create( ...@@ -210,28 +219,32 @@ int esm_ebr_context_create(
***************************************************************************/ ***************************************************************************/
int esm_ebr_context_release( int esm_ebr_context_release(
#ifdef NAS_MME #ifdef NAS_MME
unsigned int ueid, emm_data_context_t *ctx,
#endif #endif
int ebi, int *pid, int *bid) int ebi, int *pid, int *bid)
{ {
LOG_FUNC_IN; int found = FALSE;
esm_pdn_t *pdn = NULL;
esm_data_context_t *esm_ctx;
esm_data_context_t *ctx; LOG_FUNC_IN;
#ifdef NAS_UE #ifdef NAS_UE
ctx = &_esm_data; esm_ctx = &_esm_data;
#endif #endif
#ifdef NAS_MME #ifdef NAS_MME
# if defined(EPC_BUILD)
esm_ctx = &ctx->esm_data_ctx;
# else
if (ueid < ESM_DATA_NB_UE_MAX) { if (ueid < ESM_DATA_NB_UE_MAX) {
ctx = _esm_data.ctx[ueid]; ctx = &_esm_data.ctx[ueid];
} else { } else {
LOG_FUNC_RETURN (ESM_EBI_UNASSIGNED); LOG_FUNC_RETURN (ESM_EBI_UNASSIGNED);
} }
# endif
#endif #endif
int found = FALSE;
esm_pdn_t *pdn = NULL;
if (ebi != ESM_EBI_UNASSIGNED) { if (ebi != ESM_EBI_UNASSIGNED) {
/* /*
* The identity of the EPS bearer to released is given; * The identity of the EPS bearer to released is given;
...@@ -241,12 +254,12 @@ int esm_ebr_context_release( ...@@ -241,12 +254,12 @@ int esm_ebr_context_release(
/* Search for active PDN connection */ /* Search for active PDN connection */
for (*pid = 0; *pid < ESM_DATA_PDN_MAX; (*pid)++) { for (*pid = 0; *pid < ESM_DATA_PDN_MAX; (*pid)++) {
if ( !ctx->pdn[*pid].is_active ) { if ( !esm_ctx->pdn[*pid].is_active ) {
continue; continue;
} }
/* An active PDN connection is found */ /* An active PDN connection is found */
if (ctx->pdn[*pid].data != NULL) { if (esm_ctx->pdn[*pid].data != NULL) {
pdn = ctx->pdn[*pid].data; pdn = esm_ctx->pdn[*pid].data;
/* Search for the specified EPS bearer context entry */ /* Search for the specified EPS bearer context entry */
for (*bid = 0; *bid < pdn->n_bearers; (*bid)++) { for (*bid = 0; *bid < pdn->n_bearers; (*bid)++) {
if (pdn->bearer[*bid] != NULL) { if (pdn->bearer[*bid] != NULL) {
...@@ -273,17 +286,17 @@ int esm_ebr_context_release( ...@@ -273,17 +286,17 @@ int esm_ebr_context_release(
* first EPS bearer context entry at index bid = 0 * first EPS bearer context entry at index bid = 0
*/ */
if (*pid < ESM_DATA_PDN_MAX) { if (*pid < ESM_DATA_PDN_MAX) {
if (*pid != ctx->pdn[*pid].pid) { if (*pid != esm_ctx->pdn[*pid].pid) {
LOG_TRACE(ERROR, "ESM-PROC - PDN connection identifier %d " LOG_TRACE(ERROR, "ESM-PROC - PDN connection identifier %d "
"is not valid", *pid); "is not valid", *pid);
} else if (!ctx->pdn[*pid].is_active) { } else if (!esm_ctx->pdn[*pid].is_active) {
LOG_TRACE(WARNING,"ESM-PROC - PDN connection %d is not active", LOG_TRACE(WARNING,"ESM-PROC - PDN connection %d is not active",
*pid); *pid);
} else if (ctx->pdn[*pid].data == NULL) { } else if (esm_ctx->pdn[*pid].data == NULL) {
LOG_TRACE(ERROR, "ESM-PROC - PDN connection %d has not been " LOG_TRACE(ERROR, "ESM-PROC - PDN connection %d has not been "
"allocated", *pid); "allocated", *pid);
} else { } else {
pdn = ctx->pdn[*pid].data; pdn = esm_ctx->pdn[*pid].data;
if (pdn->bearer[*bid] != NULL) { if (pdn->bearer[*bid] != NULL) {
ebi = pdn->bearer[*bid]->ebi; ebi = pdn->bearer[*bid]->ebi;
found = TRUE; found = TRUE;
...@@ -317,7 +330,7 @@ int esm_ebr_context_release( ...@@ -317,7 +330,7 @@ int esm_ebr_context_release(
* to the PDN connection */ * to the PDN connection */
pdn->n_bearers -= 1; pdn->n_bearers -= 1;
/* Decrement the total number of active EPS bearers */ /* Decrement the total number of active EPS bearers */
ctx->n_ebrs -= 1; esm_ctx->n_ebrs -= 1;
if (*bid == 0) { if (*bid == 0) {
/* 3GPP TS 24.301, section 6.4.4.3, 6.4.4.6 /* 3GPP TS 24.301, section 6.4.4.3, 6.4.4.6
...@@ -341,7 +354,7 @@ int esm_ebr_context_release( ...@@ -341,7 +354,7 @@ int esm_ebr_context_release(
ESM_EBR_INACTIVE, TRUE); ESM_EBR_INACTIVE, TRUE);
#endif #endif
#ifdef NAS_MME #ifdef NAS_MME
(void) esm_ebr_set_status(ueid, pdn->bearer[i]->ebi, (void) esm_ebr_set_status(ctx, pdn->bearer[i]->ebi,
ESM_EBR_INACTIVE, TRUE); ESM_EBR_INACTIVE, TRUE);
#endif #endif
/* Release EPS bearer data */ /* Release EPS bearer data */
...@@ -349,7 +362,7 @@ int esm_ebr_context_release( ...@@ -349,7 +362,7 @@ int esm_ebr_context_release(
(void) esm_ebr_release(pdn->bearer[i]->ebi); (void) esm_ebr_release(pdn->bearer[i]->ebi);
#endif #endif
#ifdef NAS_MME #ifdef NAS_MME
(void) esm_ebr_release(ueid, pdn->bearer[i]->ebi); (void) esm_ebr_release(ctx, pdn->bearer[i]->ebi);
#endif #endif
// esm_ebr_release() // esm_ebr_release()
/* Release dedicated EPS bearer data */ /* Release dedicated EPS bearer data */
...@@ -359,14 +372,14 @@ int esm_ebr_context_release( ...@@ -359,14 +372,14 @@ int esm_ebr_context_release(
* to the PDN connection */ * to the PDN connection */
pdn->n_bearers -= 1; pdn->n_bearers -= 1;
/* Decrement the total number of active EPS bearers */ /* Decrement the total number of active EPS bearers */
ctx->n_ebrs -= 1; esm_ctx->n_ebrs -= 1;
} }
} }
/* Reset the PDN connection activation indicator */ /* Reset the PDN connection activation indicator */
ctx->pdn[*pid].is_active = FALSE; esm_ctx->pdn[*pid].is_active = FALSE;
/* Update the emergency bearer services indicator */ /* Update the emergency bearer services indicator */
if (pdn->is_emergency) { if (pdn->is_emergency) {
ctx->emergency = FALSE; esm_ctx->emergency = FALSE;
} }
} }
...@@ -375,7 +388,7 @@ int esm_ebr_context_release( ...@@ -375,7 +388,7 @@ int esm_ebr_context_release(
* If the UE locally deactivated all EPS bearer contexts, the UE * If the UE locally deactivated all EPS bearer contexts, the UE
* shall perform a local detach and enter state EMM-DEREGISTERED. * shall perform a local detach and enter state EMM-DEREGISTERED.
*/ */
if (ctx->n_ebrs == 0) { if (esm_ctx->n_ebrs == 0) {
emm_sap_t emm_sap; emm_sap_t emm_sap;
emm_sap.primitive = EMMESM_ESTABLISH_CNF; emm_sap.primitive = EMMESM_ESTABLISH_CNF;
emm_sap.u.emm_esm.u.establish.is_attached = FALSE; emm_sap.u.emm_esm.u.establish.is_attached = FALSE;
...@@ -387,7 +400,7 @@ int esm_ebr_context_release( ...@@ -387,7 +400,7 @@ int esm_ebr_context_release(
* the UE shall consider itself attached for emergency bearer * the UE shall consider itself attached for emergency bearer
* services only. * services only.
*/ */
else if ( ctx->emergency && (ctx->n_ebrs == 1) ) { else if (esm_ctx->emergency && (esm_ctx->n_ebrs == 1) ) {
emm_sap_t emm_sap; emm_sap_t emm_sap;
emm_sap.primitive = EMMESM_ESTABLISH_CNF; emm_sap.primitive = EMMESM_ESTABLISH_CNF;
emm_sap.u.emm_esm.u.establish.is_attached = TRUE; emm_sap.u.emm_esm.u.establish.is_attached = TRUE;
...@@ -396,7 +409,7 @@ int esm_ebr_context_release( ...@@ -396,7 +409,7 @@ int esm_ebr_context_release(
} }
#endif // NAS_UE #endif // NAS_UE
#ifdef NAS_MME #ifdef NAS_MME
if (ctx->n_ebrs == 0) { if (esm_ctx->n_ebrs == 0) {
/* TODO: Release the PDN connection and marked the UE as inactive /* TODO: Release the PDN connection and marked the UE as inactive
* in the network for EPS services (is_attached = FALSE) */ * in the network for EPS services (is_attached = FALSE) */
} }
......
openair-cn/NAS/EURECOM-NAS/src/esm/esm_ebr_context.h
View file @ 708013af
...@@ -62,10 +62,10 @@ int esm_ebr_context_check_tft(int pid, int ebi, const network_tft_t *tft, ...@@ -62,10 +62,10 @@ int esm_ebr_context_check_tft(int pid, int ebi, const network_tft_t *tft,
#endif #endif
#ifdef NAS_MME #ifdef NAS_MME
int esm_ebr_context_create(unsigned int ueid, int pid, int ebi, int is_default, int esm_ebr_context_create(emm_data_context_t *ctx, int pid, int ebi, int is_default,
const network_qos_t *qos, const network_tft_t *tft); const network_qos_t *qos, const network_tft_t *tft);
int esm_ebr_context_release(unsigned int ueid, int ebi, int *pid, int *bid); int esm_ebr_context_release(emm_data_context_t *ctx, int ebi, int *pid, int *bid);
#endif #endif
#endif /* __ESM_EBR_CONTEXT_H__ */ #endif /* __ESM_EBR_CONTEXT_H__ */
openair-cn/NAS/EURECOM-NAS/src/esm/esm_ip.c
View file @ 708013af
#include "emmData.h"
#include "esmData.h" #include "esmData.h"
char ip_addr_str[100]; char ip_addr_str[100];
......
openair-cn/NAS/EURECOM-NAS/src/esm/esm_main.c
View file @ 708013af
...@@ -23,6 +23,7 @@ Description Defines the EPS Session Management procedure call manager, ...@@ -23,6 +23,7 @@ Description Defines the EPS Session Management procedure call manager,
#include "commonDef.h" #include "commonDef.h"
#include "nas_log.h" #include "nas_log.h"
#include "emmData.h"
#include "esmData.h" #include "esmData.h"
#include "esm_pt.h" #include "esm_pt.h"
#include "esm_ebr.h" #include "esm_ebr.h"
...@@ -106,11 +107,12 @@ void esm_main_initialize(void) ...@@ -106,11 +107,12 @@ void esm_main_initialize(void)
if (mme_api_get_esm_config(&_esm_data.conf) != RETURNok) { if (mme_api_get_esm_config(&_esm_data.conf) != RETURNok) {
LOG_TRACE(ERROR, "ESM-MAIN - Failed to get MME configuration data"); LOG_TRACE(ERROR, "ESM-MAIN - Failed to get MME configuration data");
} }
# if !defined(EPC_BUILD)
/* Initialize ESM contexts */ /* Initialize ESM contexts */
for (i = 0; i < ESM_DATA_NB_UE_MAX; i++) { for (i = 0; i < ESM_DATA_NB_UE_MAX; i++) {
_esm_data.ctx[i] = NULL; _esm_data.ctx[i] = NULL;
} }
# endif
/* Initialize the EPS bearer context manager */ /* Initialize the EPS bearer context manager */
esm_ebr_initialize(); esm_ebr_initialize();
......
openair-cn/NAS/EURECOM-NAS/src/esm/esm_proc.h
View file @ 708013af
...@@ -23,6 +23,7 @@ Description Defines the EPS Session Management procedures executed at ...@@ -23,6 +23,7 @@ Description Defines the EPS Session Management procedures executed at
#include "networkDef.h" #include "networkDef.h"
#include "OctetString.h" #include "OctetString.h"
#include "emmData.h"
/****************************************************************************/ /****************************************************************************/
/********************* G L O B A L C O N S T A N T S *******************/ /********************* G L O B A L C O N S T A N T S *******************/
...@@ -68,7 +69,7 @@ typedef enum { ...@@ -68,7 +69,7 @@ typedef enum {
typedef int (*esm_proc_procedure_t) (int, int, OctetString *, int); typedef int (*esm_proc_procedure_t) (int, int, OctetString *, int);
#endif #endif
#ifdef NAS_MME #ifdef NAS_MME
typedef int (*esm_proc_procedure_t) (int, unsigned int, int, OctetString *, int); typedef int (*esm_proc_procedure_t) (int, emm_data_context_t *, int, OctetString *, int);
#endif #endif
/* EPS bearer level QoS parameters */ /* EPS bearer level QoS parameters */
...@@ -106,8 +107,8 @@ int esm_proc_status(int is_standalone, int pti, OctetString *msg, ...@@ -106,8 +107,8 @@ int esm_proc_status(int is_standalone, int pti, OctetString *msg,
#endif #endif
#ifdef NAS_MME #ifdef NAS_MME
int esm_proc_status_ind(unsigned int ueid, int pti, int ebi, int *esm_cause); int esm_proc_status_ind(emm_data_context_t *ctx, int pti, int ebi, int *esm_cause);
int esm_proc_status(int is_standalone, unsigned int ueid, int pti, int esm_proc_status(int is_standalone, emm_data_context_t *ctx, int pti,
OctetString *msg, int sent_by_ue); OctetString *msg, int sent_by_ue);
#endif #endif
...@@ -131,14 +132,14 @@ int esm_proc_pdn_connectivity_failure(int is_pending); ...@@ -131,14 +132,14 @@ int esm_proc_pdn_connectivity_failure(int is_pending);
#endif #endif
#ifdef NAS_MME #ifdef NAS_MME
int esm_proc_pdn_connectivity_request(unsigned int ueid, int pti, int esm_proc_pdn_connectivity_request(emm_data_context_t *ctx, int pti,
esm_proc_pdn_request_t request_type, OctetString *apn, esm_proc_pdn_request_t request_type, OctetString *apn,
esm_proc_pdn_type_t pdn_type, OctetString *pdn_addr, esm_proc_qos_t *esm_qos, esm_proc_pdn_type_t pdn_type, OctetString *pdn_addr, esm_proc_qos_t *esm_qos,
int *esm_cause); int *esm_cause);
int esm_proc_pdn_connectivity_reject(int is_standalone, unsigned int ueid, int esm_proc_pdn_connectivity_reject(int is_standalone, emm_data_context_t *ctx,
int ebi, OctetString *msg, int ue_triggered); int ebi, OctetString *msg, int ue_triggered);
int esm_proc_pdn_connectivity_failure(unsigned int ueid, int pid); int esm_proc_pdn_connectivity_failure(emm_data_context_t *ctx, int pid);
#endif #endif
/* /*
...@@ -156,10 +157,10 @@ int esm_proc_pdn_disconnect_reject(int pti, int *esm_cause); ...@@ -156,10 +157,10 @@ int esm_proc_pdn_disconnect_reject(int pti, int *esm_cause);
#endif #endif
#ifdef NAS_MME #ifdef NAS_MME
int esm_proc_pdn_disconnect_request(unsigned int ueid, int pti, int *esm_cause); int esm_proc_pdn_disconnect_request(emm_data_context_t *ctx, int pti, int *esm_cause);
int esm_proc_pdn_disconnect_accept(unsigned int ueid, int pid, int *esm_cause); int esm_proc_pdn_disconnect_accept(emm_data_context_t *ctx, int pid, int *esm_cause);
int esm_proc_pdn_disconnect_reject(int is_standalone, unsigned int ueid, int esm_proc_pdn_disconnect_reject(int is_standalone, emm_data_context_t *ctx,
int ebi, OctetString *msg, int ue_triggered); int ebi, OctetString *msg, int ue_triggered);
#endif #endif
...@@ -169,15 +170,15 @@ int esm_proc_pdn_disconnect_reject(int is_standalone, unsigned int ueid, ...@@ -169,15 +170,15 @@ int esm_proc_pdn_disconnect_reject(int is_standalone, unsigned int ueid,
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
*/ */
#ifdef NAS_MME #ifdef NAS_MME
int esm_proc_default_eps_bearer_context(unsigned int ueid, int pid, int esm_proc_default_eps_bearer_context(emm_data_context_t *ctx, int pid,
unsigned int *ebi, const esm_proc_qos_t *esm_qos, int *esm_cause); unsigned int *ebi, const esm_proc_qos_t *esm_qos, int *esm_cause);
int esm_proc_default_eps_bearer_context_request(int is_standalone, int esm_proc_default_eps_bearer_context_request(int is_standalone,
unsigned int ueid, int ebi, OctetString *msg, int ue_triggered); emm_data_context_t *ctx, int ebi, OctetString *msg, int ue_triggered);
int esm_proc_default_eps_bearer_context_failure(unsigned int ueid); int esm_proc_default_eps_bearer_context_failure(emm_data_context_t *ctx);
int esm_proc_default_eps_bearer_context_accept(unsigned int ueid, int ebi, int esm_proc_default_eps_bearer_context_accept(emm_data_context_t *ctx, int ebi,
int *esm_cause); int *esm_cause);
int esm_proc_default_eps_bearer_context_reject(unsigned int ueid, int ebi, int esm_proc_default_eps_bearer_context_reject(emm_data_context_t *ctx, int ebi,
int *esm_cause); int *esm_cause);
#endif #endif
...@@ -199,15 +200,15 @@ int esm_proc_default_eps_bearer_context_reject(int is_standalone, int ebi, ...@@ -199,15 +200,15 @@ int esm_proc_default_eps_bearer_context_reject(int is_standalone, int ebi,
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
*/ */
#ifdef NAS_MME #ifdef NAS_MME
int esm_proc_dedicated_eps_bearer_context(unsigned int ueid, int pid, int esm_proc_dedicated_eps_bearer_context(emm_data_context_t *ctx, int pid,
unsigned int *ebi, unsigned int *default_ebi, const esm_proc_qos_t *qos, unsigned int *ebi, unsigned int *default_ebi, const esm_proc_qos_t *qos,
const esm_proc_tft_t *tft, int *esm_cause); const esm_proc_tft_t *tft, int *esm_cause);
int esm_proc_dedicated_eps_bearer_context_request(int is_standalone, int esm_proc_dedicated_eps_bearer_context_request(int is_standalone,
unsigned int ueid, int ebi, OctetString *msg, int ue_triggered); emm_data_context_t *ctx, int ebi, OctetString *msg, int ue_triggered);
int esm_proc_dedicated_eps_bearer_context_accept(unsigned int ueid, int ebi, int esm_proc_dedicated_eps_bearer_context_accept(emm_data_context_t *ctx, int ebi,
int *esm_cause); int *esm_cause);
int esm_proc_dedicated_eps_bearer_context_reject(unsigned int ueid, int ebi, int esm_proc_dedicated_eps_bearer_context_reject(emm_data_context_t *ctx, int ebi,
int *esm_cause); int *esm_cause);
#endif #endif
...@@ -227,12 +228,12 @@ int esm_proc_dedicated_eps_bearer_context_reject(int is_standalone, int ebi, ...@@ -227,12 +228,12 @@ int esm_proc_dedicated_eps_bearer_context_reject(int is_standalone, int ebi,
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
*/ */
#ifdef NAS_MME #ifdef NAS_MME
int esm_proc_eps_bearer_context_deactivate(unsigned int ueid, int is_local, int esm_proc_eps_bearer_context_deactivate(emm_data_context_t *ctx, int is_local,
int ebi, int *pid, int *bid, int *esm_cause); int ebi, int *pid, int *bid,
int *esm_cause);
int esm_proc_eps_bearer_context_deactivate_request(int is_standalone, int esm_proc_eps_bearer_context_deactivate_request(int is_standalone,
unsigned int ueid, int ebi, OctetString *msg, int ue_triggered); emm_data_context_t *ctx, int ebi, OctetString *msg, int ue_triggered);
int esm_proc_eps_bearer_context_deactivate_accept(emm_data_context_t *ctx, int ebi,
int esm_proc_eps_bearer_context_deactivate_accept(unsigned int ueid, int ebi,
int *esm_cause); int *esm_cause);
#endif #endif
......
openair-cn/NAS/EURECOM-NAS/src/esm/sap/esm_recv.h
View file @ 708013af
...@@ -23,6 +23,7 @@ Description Defines functions executed at the ESM Service Access ...@@ -23,6 +23,7 @@ Description Defines functions executed at the ESM Service Access
#define __ESM_RECV_H__ #define __ESM_RECV_H__
#include "EsmStatus.h" #include "EsmStatus.h"
#include "emmData.h"
#ifdef NAS_UE #ifdef NAS_UE
#include "PdnConnectivityReject.h" #include "PdnConnectivityReject.h"
...@@ -80,7 +81,7 @@ Description Defines functions executed at the ESM Service Access ...@@ -80,7 +81,7 @@ Description Defines functions executed at the ESM Service Access
int esm_recv_status(int pti, int ebi, const esm_status_msg *msg); int esm_recv_status(int pti, int ebi, const esm_status_msg *msg);
#endif #endif
#ifdef NAS_MME #ifdef NAS_MME
int esm_recv_status(unsigned int ueid, int pti, int ebi, int esm_recv_status(emm_data_context_t *ctx, int pti, int ebi,
const esm_status_msg *msg); const esm_status_msg *msg);
#endif #endif
...@@ -124,29 +125,30 @@ int esm_recv_deactivate_eps_bearer_context_request(int pti, int ebi, ...@@ -124,29 +125,30 @@ int esm_recv_deactivate_eps_bearer_context_request(int pti, int ebi,
* Transaction related messages * Transaction related messages
* ---------------------------- * ----------------------------
*/ */
int esm_recv_pdn_connectivity_request(unsigned int ueid, int pti, int ebi, int esm_recv_pdn_connectivity_request(emm_data_context_t *ctx, int pti, int ebi,
const pdn_connectivity_request_msg *msg, unsigned int *new_ebi, void *data); const pdn_connectivity_request_msg *msg, unsigned int *new_ebi, void *data);
int esm_recv_pdn_disconnect_request(unsigned int ueid, int pti, int ebi, int esm_recv_pdn_disconnect_request(emm_data_context_t *ctx, int pti, int ebi,
const pdn_disconnect_request_msg *msg, unsigned int *linked_ebi); const pdn_disconnect_request_msg *msg,
unsigned int *linked_ebi);
/* /*
* Messages related to EPS bearer contexts * Messages related to EPS bearer contexts
* --------------------------------------- * ---------------------------------------
*/ */
int esm_recv_activate_default_eps_bearer_context_accept(unsigned int ueid, int esm_recv_activate_default_eps_bearer_context_accept(emm_data_context_t *ctx,
int pti, int ebi, const activate_default_eps_bearer_context_accept_msg *msg); int pti, int ebi, const activate_default_eps_bearer_context_accept_msg *msg);
int esm_recv_activate_default_eps_bearer_context_reject(unsigned int ueid, int esm_recv_activate_default_eps_bearer_context_reject(emm_data_context_t *ctx,
int pti, int ebi, const activate_default_eps_bearer_context_reject_msg *msg); int pti, int ebi, const activate_default_eps_bearer_context_reject_msg *msg);
int esm_recv_activate_dedicated_eps_bearer_context_accept(unsigned int ueid, int esm_recv_activate_dedicated_eps_bearer_context_accept(emm_data_context_t *ctx,
int pti, int ebi, const activate_dedicated_eps_bearer_context_accept_msg *msg); int pti, int ebi, const activate_dedicated_eps_bearer_context_accept_msg *msg);
int esm_recv_activate_dedicated_eps_bearer_context_reject(unsigned int ueid, int esm_recv_activate_dedicated_eps_bearer_context_reject(emm_data_context_t *ctx,
int pti, int ebi, const activate_dedicated_eps_bearer_context_reject_msg *msg); int pti, int ebi, const activate_dedicated_eps_bearer_context_reject_msg *msg);
int esm_recv_deactivate_eps_bearer_context_accept(unsigned int ueid, int pti, int esm_recv_deactivate_eps_bearer_context_accept(emm_data_context_t *ctx, int pti,
int ebi, const deactivate_eps_bearer_context_accept_msg *msg); int ebi, const deactivate_eps_bearer_context_accept_msg *msg);
#endif #endif
......
openair-cn/NAS/EURECOM-NAS/src/esm/sap/esm_sap.c
View file @ 708013af
...@@ -53,9 +53,9 @@ static int _esm_sap_send(int msg_type, int is_standalone, int pti, int ebi, ...@@ -53,9 +53,9 @@ static int _esm_sap_send(int msg_type, int is_standalone, int pti, int ebi,
#endif #endif
#ifdef NAS_MME #ifdef NAS_MME
static int _esm_sap_recv(int msg_type, int is_standalone, unsigned int ueid, static int _esm_sap_recv(int msg_type, int is_standalone, emm_data_context_t *ctx,
const OctetString *req, OctetString *rsp, esm_sap_error_t *err); const OctetString *req, OctetString *rsp, esm_sap_error_t *err);
static int _esm_sap_send(int msg_type, int is_standalone, unsigned int ueid, static int _esm_sap_send(int msg_type, int is_standalone, emm_data_context_t *ctx,
int pti, int ebi, const esm_sap_data_t *data, OctetString *rsp); int pti, int ebi, const esm_sap_data_t *data, OctetString *rsp);
#endif #endif
...@@ -186,16 +186,16 @@ int esm_sap_send(esm_sap_t *msg) ...@@ -186,16 +186,16 @@ int esm_sap_send(esm_sap_t *msg)
#ifdef NAS_MME #ifdef NAS_MME
/* The MME received a PDN connectivity request message */ /* The MME received a PDN connectivity request message */
rc = _esm_sap_recv(PDN_CONNECTIVITY_REQUEST, msg->is_standalone, rc = _esm_sap_recv(PDN_CONNECTIVITY_REQUEST, msg->is_standalone,
msg->ueid, msg->recv, &msg->send, &msg->err); msg->ctx, msg->recv, &msg->send, &msg->err);
#endif #endif
break; break;
case ESM_PDN_CONNECTIVITY_REJ: case ESM_PDN_CONNECTIVITY_REJ:
#ifdef NAS_MME #ifdef NAS_MME
/* PDN connectivity locally failed */ /* PDN connectivity locally failed */
pid = esm_proc_default_eps_bearer_context_failure(msg->ueid); pid = esm_proc_default_eps_bearer_context_failure(msg->ctx);
if (pid != RETURNerror) { if (pid != RETURNerror) {
rc = esm_proc_pdn_connectivity_failure(msg->ueid, pid); rc = esm_proc_pdn_connectivity_failure(msg->ctx, pid);
} }
#endif #endif
#ifdef NAS_UE #ifdef NAS_UE
...@@ -264,7 +264,7 @@ int esm_sap_send(esm_sap_t *msg) ...@@ -264,7 +264,7 @@ int esm_sap_send(esm_sap_t *msg)
#ifdef NAS_MME #ifdef NAS_MME
/* The MME received activate default ESP bearer context accept */ /* The MME received activate default ESP bearer context accept */
rc = _esm_sap_recv(ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_ACCEPT, rc = _esm_sap_recv(ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_ACCEPT,
msg->is_standalone, msg->ueid, msg->is_standalone, msg->ctx,
msg->recv, &msg->send, &msg->err); msg->recv, &msg->send, &msg->err);
#endif #endif
#ifdef NAS_UE #ifdef NAS_UE
...@@ -283,7 +283,7 @@ int esm_sap_send(esm_sap_t *msg) ...@@ -283,7 +283,7 @@ int esm_sap_send(esm_sap_t *msg)
#ifdef NAS_MME #ifdef NAS_MME
/* The MME received activate default ESP bearer context reject */ /* The MME received activate default ESP bearer context reject */
rc = _esm_sap_recv(ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_REJECT, rc = _esm_sap_recv(ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_REJECT,
msg->is_standalone, msg->ueid, msg->is_standalone, msg->ctx,
msg->recv, &msg->send, &msg->err); msg->recv, &msg->send, &msg->err);
#endif #endif
#ifdef NAS_UE #ifdef NAS_UE
...@@ -325,7 +325,7 @@ int esm_sap_send(esm_sap_t *msg) ...@@ -325,7 +325,7 @@ int esm_sap_send(esm_sap_t *msg)
msg->data.eps_bearer_context_deactivate.ebi, &pid, &bid); msg->data.eps_bearer_context_deactivate.ebi, &pid, &bid);
#endif #endif
#ifdef NAS_MME #ifdef NAS_MME
rc = esm_proc_eps_bearer_context_deactivate(msg->ueid, TRUE, rc = esm_proc_eps_bearer_context_deactivate(msg->ctx, TRUE,
msg->data.eps_bearer_context_deactivate.ebi, msg->data.eps_bearer_context_deactivate.ebi,
&pid, &bid, NULL); &pid, &bid, NULL);
#endif #endif
...@@ -341,7 +341,7 @@ int esm_sap_send(esm_sap_t *msg) ...@@ -341,7 +341,7 @@ int esm_sap_send(esm_sap_t *msg)
&msg->send, &msg->err); &msg->send, &msg->err);
#endif #endif
#ifdef NAS_MME #ifdef NAS_MME
rc = _esm_sap_recv(-1, msg->is_standalone, msg->ueid, rc = _esm_sap_recv(-1, msg->is_standalone, msg->ctx,
msg->recv, &msg->send, &msg->err); msg->recv, &msg->send, &msg->err);
#endif #endif
break; break;
...@@ -396,7 +396,7 @@ int esm_sap_send(esm_sap_t *msg) ...@@ -396,7 +396,7 @@ int esm_sap_send(esm_sap_t *msg)
***************************************************************************/ ***************************************************************************/
static int _esm_sap_recv(int msg_type, int is_standalone, static int _esm_sap_recv(int msg_type, int is_standalone,
#ifdef NAS_MME #ifdef NAS_MME
unsigned int ueid, emm_data_context_t *ctx,
#endif #endif
const OctetString *req, OctetString *rsp, const OctetString *req, OctetString *rsp,
esm_sap_error_t *err) esm_sap_error_t *err)
...@@ -647,7 +647,7 @@ static int _esm_sap_recv(int msg_type, int is_standalone, ...@@ -647,7 +647,7 @@ static int _esm_sap_recv(int msg_type, int is_standalone,
* received from the UE * received from the UE
*/ */
esm_cause = esm_recv_activate_default_eps_bearer_context_accept( esm_cause = esm_recv_activate_default_eps_bearer_context_accept(
ueid, pti, ebi, ctx, pti, ebi,
&esm_msg.activate_default_eps_bearer_context_accept); &esm_msg.activate_default_eps_bearer_context_accept);
if ( (esm_cause == ESM_CAUSE_INVALID_PTI_VALUE) || if ( (esm_cause == ESM_CAUSE_INVALID_PTI_VALUE) ||
...@@ -668,7 +668,7 @@ static int _esm_sap_recv(int msg_type, int is_standalone, ...@@ -668,7 +668,7 @@ static int _esm_sap_recv(int msg_type, int is_standalone,
* received from the UE * received from the UE
*/ */
esm_cause = esm_recv_activate_default_eps_bearer_context_reject( esm_cause = esm_recv_activate_default_eps_bearer_context_reject(
ueid, pti, ebi, ctx, pti, ebi,
&esm_msg.activate_default_eps_bearer_context_reject); &esm_msg.activate_default_eps_bearer_context_reject);
if ( (esm_cause == ESM_CAUSE_INVALID_PTI_VALUE) || if ( (esm_cause == ESM_CAUSE_INVALID_PTI_VALUE) ||
...@@ -689,7 +689,7 @@ static int _esm_sap_recv(int msg_type, int is_standalone, ...@@ -689,7 +689,7 @@ static int _esm_sap_recv(int msg_type, int is_standalone,
* received from the UE * received from the UE
*/ */
esm_cause = esm_recv_deactivate_eps_bearer_context_accept( esm_cause = esm_recv_deactivate_eps_bearer_context_accept(
ueid, pti, ebi, ctx, pti, ebi,
&esm_msg.deactivate_eps_bearer_context_accept); &esm_msg.deactivate_eps_bearer_context_accept);
if ( (esm_cause == ESM_CAUSE_INVALID_PTI_VALUE) || if ( (esm_cause == ESM_CAUSE_INVALID_PTI_VALUE) ||
...@@ -710,7 +710,7 @@ static int _esm_sap_recv(int msg_type, int is_standalone, ...@@ -710,7 +710,7 @@ static int _esm_sap_recv(int msg_type, int is_standalone,
* received from the UE * received from the UE
*/ */
esm_cause = esm_recv_activate_dedicated_eps_bearer_context_accept( esm_cause = esm_recv_activate_dedicated_eps_bearer_context_accept(
ueid, pti, ebi, ctx, pti, ebi,
&esm_msg.activate_dedicated_eps_bearer_context_accept); &esm_msg.activate_dedicated_eps_bearer_context_accept);
if ( (esm_cause == ESM_CAUSE_INVALID_PTI_VALUE) || if ( (esm_cause == ESM_CAUSE_INVALID_PTI_VALUE) ||
...@@ -731,7 +731,7 @@ static int _esm_sap_recv(int msg_type, int is_standalone, ...@@ -731,7 +731,7 @@ static int _esm_sap_recv(int msg_type, int is_standalone,
* received from the UE * received from the UE
*/ */
esm_cause = esm_recv_activate_dedicated_eps_bearer_context_reject( esm_cause = esm_recv_activate_dedicated_eps_bearer_context_reject(
ueid, pti, ebi, ctx, pti, ebi,
&esm_msg.activate_dedicated_eps_bearer_context_reject); &esm_msg.activate_dedicated_eps_bearer_context_reject);
if ( (esm_cause == ESM_CAUSE_INVALID_PTI_VALUE) || if ( (esm_cause == ESM_CAUSE_INVALID_PTI_VALUE) ||
...@@ -759,7 +759,7 @@ static int _esm_sap_recv(int msg_type, int is_standalone, ...@@ -759,7 +759,7 @@ static int _esm_sap_recv(int msg_type, int is_standalone,
/* /*
* Process PDN connectivity request message received from the UE * Process PDN connectivity request message received from the UE
*/ */
esm_cause = esm_recv_pdn_connectivity_request(ueid, pti, ebi, esm_cause = esm_recv_pdn_connectivity_request(ctx, pti, ebi,
&esm_msg.pdn_connectivity_request, &esm_msg.pdn_connectivity_request,
&ebi, &data); &ebi, &data);
...@@ -854,7 +854,7 @@ static int _esm_sap_recv(int msg_type, int is_standalone, ...@@ -854,7 +854,7 @@ static int _esm_sap_recv(int msg_type, int is_standalone,
/* /*
* Process PDN disconnect request message received from the UE * Process PDN disconnect request message received from the UE
*/ */
esm_cause = esm_recv_pdn_disconnect_request(ueid, pti, ebi, esm_cause = esm_recv_pdn_disconnect_request(ctx, pti, ebi,
&esm_msg.pdn_disconnect_request, &ebi); &esm_msg.pdn_disconnect_request, &ebi);
if (esm_cause != ESM_CAUSE_SUCCESS) { if (esm_cause != ESM_CAUSE_SUCCESS) {
...@@ -890,7 +890,7 @@ static int _esm_sap_recv(int msg_type, int is_standalone, ...@@ -890,7 +890,7 @@ static int _esm_sap_recv(int msg_type, int is_standalone,
/* /*
* Process received ESM status message * Process received ESM status message
*/ */
esm_cause = esm_recv_status(ueid, pti, ebi, &esm_msg.esm_status); esm_cause = esm_recv_status(ctx, pti, ebi, &esm_msg.esm_status);
break; break;
#endif #endif
...@@ -935,7 +935,7 @@ static int _esm_sap_recv(int msg_type, int is_standalone, ...@@ -935,7 +935,7 @@ static int _esm_sap_recv(int msg_type, int is_standalone,
rc = (*esm_procedure)(is_standalone, ebi, rsp, triggered_by_ue); rc = (*esm_procedure)(is_standalone, ebi, rsp, triggered_by_ue);
#endif #endif
#ifdef NAS_MME #ifdef NAS_MME
rc = (*esm_procedure)(is_standalone, ueid, ebi, rsp, triggered_by_ue); rc = (*esm_procedure)(is_standalone, ctx, ebi, rsp, triggered_by_ue);
#endif #endif
if (is_discarded) { if (is_discarded) {
/* Return indication that received message has been discarded */ /* Return indication that received message has been discarded */
...@@ -980,10 +980,10 @@ static int _esm_sap_recv(int msg_type, int is_standalone, ...@@ -980,10 +980,10 @@ static int _esm_sap_recv(int msg_type, int is_standalone,
***************************************************************************/ ***************************************************************************/
static int _esm_sap_send(int msg_type, int is_standalone, static int _esm_sap_send(int msg_type, int is_standalone,
#ifdef NAS_MME #ifdef NAS_MME
unsigned int ueid, emm_data_context_t *ctx,
#endif #endif
int pti, int ebi, const esm_sap_data_t *data, int pti, int ebi, const esm_sap_data_t *data,
OctetString *rsp) OctetString *rsp)
{ {
LOG_FUNC_IN; LOG_FUNC_IN;
...@@ -1103,7 +1103,7 @@ static int _esm_sap_send(int msg_type, int is_standalone, ...@@ -1103,7 +1103,7 @@ static int _esm_sap_send(int msg_type, int is_standalone,
rc = (*esm_procedure)(is_standalone, pti, rsp, sent_by_ue); rc = (*esm_procedure)(is_standalone, pti, rsp, sent_by_ue);
#endif #endif
#ifdef NAS_MME #ifdef NAS_MME
rc = (*esm_procedure)(is_standalone, ueid, pti, rsp, sent_by_ue); rc = (*esm_procedure)(is_standalone, ctx, pti, rsp, sent_by_ue);
#endif #endif
} }
} }
......
openair-cn/NAS/EURECOM-NAS/src/esm/sap/esm_sapDef.h
View file @ 708013af
...@@ -18,6 +18,9 @@ Description Defines the ESM Service Access Point that provides EPS ...@@ -18,6 +18,9 @@ Description Defines the ESM Service Access Point that provides EPS
bearer context handling and resources allocation procedures. bearer context handling and resources allocation procedures.
*****************************************************************************/ *****************************************************************************/
#include "emmData.h"
#ifndef __ESM_SAPDEF_H__ #ifndef __ESM_SAPDEF_H__
#define __ESM_SAPDEF_H__ #define __ESM_SAPDEF_H__
...@@ -132,11 +135,14 @@ typedef struct { ...@@ -132,11 +135,14 @@ typedef struct {
* within this primitive has to be sent/received * within this primitive has to be sent/received
* standalone or together within an EMM related * standalone or together within an EMM related
* message */ * message */
unsigned int ueid; /* Local UE identifier */ #if defined(NAS_MME)
esm_sap_error_t err; /* ESM-SAP error code */ emm_data_context_t *ctx; /* UE context */
const OctetString *recv; /* Encoded ESM message received */ #endif
OctetString send; /* Encoded ESM message to be sent */ unsigned int ueid; /* Local UE identifier */
esm_sap_data_t data; /* ESM message data parameters */ esm_sap_error_t err; /* ESM-SAP error code */
const OctetString *recv; /* Encoded ESM message received */
OctetString send; /* Encoded ESM message to be sent */
esm_sap_data_t data; /* ESM message data parameters */
} esm_sap_t; } esm_sap_t;
/****************************************************************************/ /****************************************************************************/
......
openair-cn/NAS/nas_itti_messaging.c
View file @ 708013af
...@@ -47,20 +47,6 @@ int nas_itti_dl_data_req(const uint32_t ue_id, void *const data, ...@@ -47,20 +47,6 @@ int nas_itti_dl_data_req(const uint32_t ue_id, void *const data,
return itti_send_msg_to_task(TASK_S1AP, INSTANCE_DEFAULT, message_p); return itti_send_msg_to_task(TASK_S1AP, INSTANCE_DEFAULT, message_p);
} }
void nas_itti_establish_cnf(const nas_error_code_t error_code, void *const data,
const uint32_t length)
{
MessageDef *message_p;
message_p = itti_alloc_new_message(TASK_NAS, NAS_CONNECTION_ESTABLISHMENT_CNF);
NAS_CONN_EST_CNF(message_p).nas_establish_cnf.nasMsg.data = data;
NAS_CONN_EST_CNF(message_p).nas_establish_cnf.nasMsg.length = length;
NAS_CONN_EST_CNF(message_p).nas_establish_cnf.errCode = error_code;
itti_send_msg_to_task(TASK_S1AP, INSTANCE_DEFAULT, message_p);
}
#endif #endif
#if defined(UE_BUILD) && defined(NAS_UE) #if defined(UE_BUILD) && defined(NAS_UE)
......
openair-cn/NAS/nas_itti_messaging.h
View file @ 708013af
...@@ -43,8 +43,21 @@ ...@@ -43,8 +43,21 @@
int nas_itti_dl_data_req(const uint32_t ue_id, void *const data, int nas_itti_dl_data_req(const uint32_t ue_id, void *const data,
const uint32_t length); const uint32_t length);
void nas_itti_establish_cnf(const nas_error_code_t error_code, void *const data, static inline void nas_itti_establish_cnf(const uint32_t ue_id,
const uint32_t length); const nas_error_code_t error_code, void *const data,
const uint32_t length)
{
MessageDef *message_p;
message_p = itti_alloc_new_message(TASK_NAS, NAS_CONNECTION_ESTABLISHMENT_CNF);
NAS_CONNECTION_ESTABLISHMENT_CNF(message_p).UEid = ue_id;
NAS_CONNECTION_ESTABLISHMENT_CNF(message_p).errCode = error_code;
NAS_CONNECTION_ESTABLISHMENT_CNF(message_p).nasMsg.data = data;
NAS_CONNECTION_ESTABLISHMENT_CNF(message_p).nasMsg.length = length;
itti_send_msg_to_task(TASK_S1AP, INSTANCE_DEFAULT, message_p);
}
static inline void nas_itti_auth_info_req(const uint32_t ue_id, static inline void nas_itti_auth_info_req(const uint32_t ue_id,
const imsi_t *const imsi, uint8_t initial_req, const uint8_t *auts) const imsi_t *const imsi, uint8_t initial_req, const uint8_t *auts)
......
openair-cn/S1AP/s1ap_eNB_handlers.c
View file @ 708013af
...@@ -470,7 +470,7 @@ int s1ap_eNB_handle_initial_context_request(uint32_t assoc_id, ...@@ -470,7 +470,7 @@ int s1ap_eNB_handle_initial_context_request(uint32_t assoc_id,
S1AP_INITIAL_CONTEXT_SETUP_REQ(message_p).e_rab_param[i].nas_pdu.buffer = S1AP_INITIAL_CONTEXT_SETUP_REQ(message_p).e_rab_param[i].nas_pdu.buffer =
malloc(sizeof(uint8_t) * item_p->nAS_PDU->size); malloc(sizeof(uint8_t) * item_p->nAS_PDU->size);
memcpy(&S1AP_INITIAL_CONTEXT_SETUP_REQ(message_p).e_rab_param[i].nas_pdu.buffer, memcpy(S1AP_INITIAL_CONTEXT_SETUP_REQ(message_p).e_rab_param[i].nas_pdu.buffer,
item_p->nAS_PDU->buf, item_p->nAS_PDU->size); item_p->nAS_PDU->buf, item_p->nAS_PDU->size);
} else { } else {
S1AP_INITIAL_CONTEXT_SETUP_REQ(message_p).e_rab_param[i].nas_pdu.length = 0; S1AP_INITIAL_CONTEXT_SETUP_REQ(message_p).e_rab_param[i].nas_pdu.length = 0;
......
openair-cn/S1AP/s1ap_mme.c
View file @ 708013af
...@@ -151,16 +151,7 @@ void *s1ap_mme_thread(void *args) ...@@ -151,16 +151,7 @@ void *s1ap_mme_thread(void *args)
} break; } break;
#else #else
case NAS_CONNECTION_ESTABLISHMENT_CNF: { case NAS_CONNECTION_ESTABLISHMENT_CNF: {
if (AS_TERMINATED_NAS == NAS_CONN_EST_CNF(received_message_p).nas_establish_cnf.errCode) { s1ap_handle_conn_est_cnf(&NAS_CONNECTION_ESTABLISHMENT_CNF(received_message_p));
/* Attach rejected by NAS -> send result via
* DL info transfer message
*/
s1ap_generate_downlink_nas_transport(NAS_CONN_EST_CNF(received_message_p).ue_id,
NAS_CONN_EST_CNF(received_message_p).nas_establish_cnf.nasMsg.data,
NAS_CONN_EST_CNF(received_message_p).nas_establish_cnf.nasMsg.length);
} else {
s1ap_handle_conn_est_cnf(&NAS_CONN_EST_CNF(received_message_p));
}
} break; } break;
#endif #endif
......
openair-cn/S1AP/s1ap_mme_nas_procedures.c
View file @ 708013af
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
*******************************************************************************/ *******************************************************************************/
#include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include "s1ap_common.h" #include "s1ap_common.h"
...@@ -226,7 +227,6 @@ int s1ap_generate_downlink_nas_transport(const uint32_t ue_id, void * const data ...@@ -226,7 +227,6 @@ int s1ap_generate_downlink_nas_transport(const uint32_t ue_id, void * const data
s1ap_mme_itti_send_sctp_request(buffer_p, length, s1ap_mme_itti_send_sctp_request(buffer_p, length,
ue_ref->eNB->sctp_assoc_id, ue_ref->eNB->sctp_assoc_id,
ue_ref->sctp_stream_send); ue_ref->sctp_stream_send);
//s1ap_mme_itti_nas_downlink_cnf(ue_ref->mme_ue_s1ap_id, AS_SUCCESS);
} }
return 0; return 0;
} }
...@@ -365,26 +365,24 @@ void s1ap_handle_conn_est_cnf(nas_conn_est_cnf_t *nas_conn_est_cnf_p) ...@@ -365,26 +365,24 @@ void s1ap_handle_conn_est_cnf(nas_conn_est_cnf_t *nas_conn_est_cnf_p)
* At least one bearer has been established. We can now send s1ap initial context setup request * At least one bearer has been established. We can now send s1ap initial context setup request
* message to eNB. * message to eNB.
*/ */
uint8_t supportedAlgorithms[] = { 0x00, 0x02 }; uint8_t supportedAlgorithms[] = { 0x00, 0x00 };
uint8_t offset = 0; uint8_t offset = 0;
uint8_t *buffer_p; uint8_t *buffer_p;
uint32_t length; uint32_t length, teid = 12;
ue_description_t *ue_ref = NULL; ue_description_t *ue_ref = NULL;
s1ap_message message; s1ap_message message;
s1ap_initial_ctxt_setup_req_t *initial_p;
S1ap_InitialContextSetupRequestIEs_t *initialContextSetupRequest_p; S1ap_InitialContextSetupRequestIEs_t *initialContextSetupRequest_p;
S1ap_E_RABToBeSetupItemCtxtSUReq_t e_RABToBeSetup; S1ap_E_RABToBeSetupItemCtxtSUReq_t e_RABToBeSetup;
S1ap_NAS_PDU_t nas_pdu;
DevAssert(nas_conn_est_cnf_p != NULL); DevAssert(nas_conn_est_cnf_p != NULL);
initial_p = &nas_conn_est_cnf_p->transparent; if ((ue_ref = s1ap_is_ue_mme_id_in_list(nas_conn_est_cnf_p->UEid)) == NULL) {
if ((ue_ref = s1ap_is_ue_mme_id_in_list(initial_p->mme_ue_s1ap_id)) == NULL) {
S1AP_DEBUG("This mme ue s1ap id (%08x) is not attached to any UE context\n", S1AP_DEBUG("This mme ue s1ap id (%08x) is not attached to any UE context\n",
initial_p->mme_ue_s1ap_id); nas_conn_est_cnf_p->UEid);
DevParam(initial_p->mme_ue_s1ap_id, 0, 0); DevParam(nas_conn_est_cnf_p->UEid, 0, 0);
} }
/* Start the outcome response timer. /* Start the outcome response timer.
...@@ -409,53 +407,72 @@ void s1ap_handle_conn_est_cnf(nas_conn_est_cnf_t *nas_conn_est_cnf_p) ...@@ -409,53 +407,72 @@ void s1ap_handle_conn_est_cnf(nas_conn_est_cnf_t *nas_conn_est_cnf_p)
initialContextSetupRequest_p->eNB_UE_S1AP_ID = (unsigned long)ue_ref->eNB_ue_s1ap_id; initialContextSetupRequest_p->eNB_UE_S1AP_ID = (unsigned long)ue_ref->eNB_ue_s1ap_id;
/* uEaggregateMaximumBitrateDL and uEaggregateMaximumBitrateUL expressed in term of bits/sec */ /* uEaggregateMaximumBitrateDL and uEaggregateMaximumBitrateUL expressed in term of bits/sec */
initialContextSetupRequest_p->uEaggregateMaximumBitrate.uEaggregateMaximumBitRateDL = initial_p->ambr.br_dl; // initialContextSetupRequest_p->uEaggregateMaximumBitrate.uEaggregateMaximumBitRateDL = initial_p->ambr.br_dl;
initialContextSetupRequest_p->uEaggregateMaximumBitrate.uEaggregateMaximumBitRateUL = initial_p->ambr.br_ul; // initialContextSetupRequest_p->uEaggregateMaximumBitrate.uEaggregateMaximumBitRateUL = initial_p->ambr.br_ul;
e_RABToBeSetup.e_RAB_ID = initial_p->ebi; initialContextSetupRequest_p->uEaggregateMaximumBitrate.uEaggregateMaximumBitRateDL = 1024 * 1024;
e_RABToBeSetup.e_RABlevelQoSParameters.qCI = initial_p->qci; initialContextSetupRequest_p->uEaggregateMaximumBitrate.uEaggregateMaximumBitRateDL = 512 * 1024;
e_RABToBeSetup.e_RABlevelQoSParameters.allocationRetentionPriority.priorityLevel
= initial_p->prio_level; //No priority // e_RABToBeSetup.e_RAB_ID = initial_p->ebi;
e_RABToBeSetup.e_RABlevelQoSParameters.allocationRetentionPriority.pre_emptionCapability e_RABToBeSetup.e_RAB_ID = 5;
= initial_p->pre_emp_capability; // e_RABToBeSetup.e_RABlevelQoSParameters.qCI = initial_p->qci;
e_RABToBeSetup.e_RABlevelQoSParameters.allocationRetentionPriority.pre_emptionVulnerability e_RABToBeSetup.e_RABlevelQoSParameters.qCI = 0;
= initial_p->pre_emp_vulnerability;
memset(&nas_pdu, 0, sizeof(nas_pdu));
nas_pdu.size = nas_conn_est_cnf_p->nasMsg.length;
nas_pdu.buf = nas_conn_est_cnf_p->nasMsg.data;
e_RABToBeSetup.nAS_PDU = &nas_pdu;
e_RABToBeSetup.e_RABlevelQoSParameters.allocationRetentionPriority.priorityLevel =
S1ap_PriorityLevel_lowest;
e_RABToBeSetup.e_RABlevelQoSParameters.allocationRetentionPriority.pre_emptionCapability =
S1ap_Pre_emptionCapability_shall_not_trigger_pre_emption;
e_RABToBeSetup.e_RABlevelQoSParameters.allocationRetentionPriority.pre_emptionVulnerability =
S1ap_Pre_emptionVulnerability_not_pre_emptable;
INT32_TO_OCTET_STRING(teid, &e_RABToBeSetup.gTP_TEID);
// e_RABToBeSetup.e_RABlevelQoSParameters.allocationRetentionPriority.priorityLevel
// = initial_p->prio_level; //No priority
// e_RABToBeSetup.e_RABlevelQoSParameters.allocationRetentionPriority.pre_emptionCapability
// = initial_p->pre_emp_capability;
// e_RABToBeSetup.e_RABlevelQoSParameters.allocationRetentionPriority.pre_emptionVulnerability
// = initial_p->pre_emp_vulnerability;
/* Set the GTP-TEID. This is the S1-U S-GW TEID */ /* Set the GTP-TEID. This is the S1-U S-GW TEID */
INT32_TO_OCTET_STRING(initial_p->teid, &e_RABToBeSetup.gTP_TEID); // INT32_TO_OCTET_STRING(initial_p->teid, &e_RABToBeSetup.gTP_TEID);
/* S-GW IP address(es) for user-plane */ /* S-GW IP address(es) for user-plane */
if ((initial_p->s_gw_address.pdn_type == IPv4) || // if ((initial_p->s_gw_address.pdn_type == IPv4) ||
(initial_p->s_gw_address.pdn_type == IPv4_AND_v6)) // (initial_p->s_gw_address.pdn_type == IPv4_AND_v6))
{ // {
e_RABToBeSetup.transportLayerAddress.buf = calloc(4, sizeof(uint8_t)); // e_RABToBeSetup.transportLayerAddress.buf = calloc(4, sizeof(uint8_t));
/* Only IPv4 supported */ // /* Only IPv4 supported */
memcpy(e_RABToBeSetup.transportLayerAddress.buf, // memcpy(e_RABToBeSetup.transportLayerAddress.buf,
initial_p->s_gw_address.address.ipv4_address, // initial_p->s_gw_address.address.ipv4_address,
4); // 4);
offset += 4; // offset += 4;
e_RABToBeSetup.transportLayerAddress.size = 4; // e_RABToBeSetup.transportLayerAddress.size = 4;
e_RABToBeSetup.transportLayerAddress.bits_unused = 0; // e_RABToBeSetup.transportLayerAddress.bits_unused = 0;
} // }
if ((initial_p->s_gw_address.pdn_type == IPv6) || // if ((initial_p->s_gw_address.pdn_type == IPv6) ||
(initial_p->s_gw_address.pdn_type == IPv4_AND_v6)) // (initial_p->s_gw_address.pdn_type == IPv4_AND_v6))
{ // {
if (offset == 0) { // if (offset == 0) {
/* Both IPv4 and IPv6 provided */ // /* Both IPv4 and IPv6 provided */
/* TODO: check memory allocation */ // /* TODO: check memory allocation */
e_RABToBeSetup.transportLayerAddress.buf = calloc(16, sizeof(uint8_t)); // e_RABToBeSetup.transportLayerAddress.buf = calloc(16, sizeof(uint8_t));
} else { // } else {
/* Only IPv6 supported */ // /* Only IPv6 supported */
/* TODO: check memory allocation */ // /* TODO: check memory allocation */
e_RABToBeSetup.transportLayerAddress.buf // e_RABToBeSetup.transportLayerAddress.buf
= realloc(e_RABToBeSetup.transportLayerAddress.buf, (16 + offset) * sizeof(uint8_t)); // = realloc(e_RABToBeSetup.transportLayerAddress.buf, (16 + offset) * sizeof(uint8_t));
} // }
memcpy(&e_RABToBeSetup.transportLayerAddress.buf[offset], // memcpy(&e_RABToBeSetup.transportLayerAddress.buf[offset],
initial_p->s_gw_address.address.ipv6_address, // initial_p->s_gw_address.address.ipv6_address,
16); // 16);
e_RABToBeSetup.transportLayerAddress.size = 16 + offset; // e_RABToBeSetup.transportLayerAddress.size = 16 + offset;
e_RABToBeSetup.transportLayerAddress.bits_unused = 0; // e_RABToBeSetup.transportLayerAddress.bits_unused = 0;
} // }
ASN_SEQUENCE_ADD(&initialContextSetupRequest_p->e_RABToBeSetupListCtxtSUReq, ASN_SEQUENCE_ADD(&initialContextSetupRequest_p->e_RABToBeSetupListCtxtSUReq,
&e_RABToBeSetup); &e_RABToBeSetup);
...@@ -473,7 +490,11 @@ void s1ap_handle_conn_est_cnf(nas_conn_est_cnf_t *nas_conn_est_cnf_p) ...@@ -473,7 +490,11 @@ void s1ap_handle_conn_est_cnf(nas_conn_est_cnf_t *nas_conn_est_cnf_p)
initialContextSetupRequest_p->ueSecurityCapabilities.integrityProtectionAlgorithms.bits_unused initialContextSetupRequest_p->ueSecurityCapabilities.integrityProtectionAlgorithms.bits_unused
= 0; = 0;
initialContextSetupRequest_p->securityKey.buf = initial_p->keNB; /* 256 bits length */ // initialContextSetupRequest_p->securityKey.buf = initial_p->keNB; /* 256 bits length */
uint8_t keNB[32];
memset(keNB, 0, sizeof(keNB));
initialContextSetupRequest_p->securityKey.buf = keNB;
initialContextSetupRequest_p->securityKey.size = 32; initialContextSetupRequest_p->securityKey.size = 32;
initialContextSetupRequest_p->securityKey.bits_unused = 0; initialContextSetupRequest_p->securityKey.bits_unused = 0;
...@@ -482,6 +503,8 @@ void s1ap_handle_conn_est_cnf(nas_conn_est_cnf_t *nas_conn_est_cnf_p) ...@@ -482,6 +503,8 @@ void s1ap_handle_conn_est_cnf(nas_conn_est_cnf_t *nas_conn_est_cnf_p)
DevMessage("Failed to encode initial context setup request message\n"); DevMessage("Failed to encode initial context setup request message\n");
} }
free(nas_conn_est_cnf_p->nasMsg.data);
s1ap_mme_itti_send_sctp_request(buffer_p, length, ue_ref->eNB->sctp_assoc_id, s1ap_mme_itti_send_sctp_request(buffer_p, length, ue_ref->eNB->sctp_assoc_id,
ue_ref->sctp_stream_send); ue_ref->sctp_stream_send);
} }
......
openair-cn/S1AP/s1ap_mme_nas_procedures.h
View file @ 708013af
...@@ -67,7 +67,7 @@ int s1ap_mme_handle_nas_non_delivery(uint32_t assocId, uint32_t stream, ...@@ -67,7 +67,7 @@ int s1ap_mme_handle_nas_non_delivery(uint32_t assocId, uint32_t stream,
#if defined(DISABLE_USE_NAS) #if defined(DISABLE_USE_NAS)
int s1ap_handle_attach_accepted(nas_attach_accept_t *attach_accept_p); int s1ap_handle_attach_accepted(nas_attach_accept_t *attach_accept_p);
#else #else
void s1ap_handle_conn_est_cnf(nas_conn_est_cnf_t *nas_conn_est_cnf_p); void s1ap_handle_conn_est_cnf(nas_conn_est_cnf_t *nas_conn_est_cnf);
#endif #endif
int s1ap_generate_downlink_nas_transport(const uint32_t ue_id, void * const data, int s1ap_generate_downlink_nas_transport(const uint32_t ue_id, void * const data,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment