maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UE/ESM: use static buffer per UE to allow reentrancy in esm_sap.c

Browse Source
This commit is contained in:
Frédéric Leroy
2017-01-25 13:08:19 +01:00
parent 7ff4939da6
commit 84fa851dfa
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair3/NAS/UE/ESM/SAP/esm_sap.c
+6 -19
View File
@@ -95,12 +95,6 @@ static const char *_esm_sap_primitive_str[] = {
"ESM_UNITDATA_IND",
};
/*
* Buffer used to encode ESM messages before being returned to the EPS
* Mobility Management sublayer in order to be sent onto the network
*/
#define ESM_SAP_BUFFER_SIZE 4096
static char _esm_sap_buffer[ESM_SAP_BUFFER_SIZE];
/****************************************************************************/
/****************** E X P O R T E D F U N C T I O N S ******************/
@@ -148,6 +142,7 @@ int esm_sap_send(nas_user_t *user, esm_sap_t *msg)
{
LOG_FUNC_IN;
esm_data_t *esm_data = user->esm_data;
msg->send.value = esm_data->send_buffer;
int rc = RETURNerror;
int pid;
@@ -359,7 +354,6 @@ int esm_sap_send(nas_user_t *user, esm_sap_t *msg)
** turned upon ESM procedure completion **
** err: Error code of the ESM procedure **
** Return: RETURNok, RETURNerror **
** Others: _esm_sap_buffer **
** **
***************************************************************************/
static int _esm_sap_recv(nas_user_t *user, int msg_type, int is_standalone,
@@ -642,13 +636,10 @@ static int _esm_sap_recv(nas_user_t *user, int msg_type, int is_standalone,
if ( (rc != RETURNerror) && (esm_procedure != NULL) ) {
/* Encode the returned ESM response message */
int size = esm_msg_encode(&esm_msg, (uint8_t *)_esm_sap_buffer,
int size = esm_msg_encode(&esm_msg, rsp->value,
ESM_SAP_BUFFER_SIZE);
if (size > 0) {
rsp->length = size;
rsp->value = (uint8_t *)(_esm_sap_buffer);
}
rsp->length = size;
/* Complete the relevant ESM procedure */
rc = (*esm_procedure)(user, is_standalone, ebi, rsp, triggered_by_ue);
@@ -691,7 +682,6 @@ static int _esm_sap_recv(nas_user_t *user, int msg_type, int is_standalone,
** Outputs: rsp: The encoded ESM response message to be re- **
** turned upon ESM procedure completion **
** Return: RETURNok, RETURNerror **
** Others: _esm_sap_buffer **
** **
***************************************************************************/
static int _esm_sap_send(nas_user_t *user, int msg_type, int is_standalone,
@@ -772,18 +762,15 @@ static int _esm_sap_send(nas_user_t *user, int msg_type, int is_standalone,
if (rc != RETURNerror) {
/* Encode the returned ESM response message */
int size = esm_msg_encode(&esm_msg, (uint8_t *)_esm_sap_buffer,
int size = esm_msg_encode(&esm_msg, rsp->value,
ESM_SAP_BUFFER_SIZE);
if (size > 0) {
rsp->length = size;
rsp->value = (uint8_t *)(_esm_sap_buffer);
}
rsp->length = size;
/* Execute the relevant ESM procedure */
if (esm_procedure) {
rc = (*esm_procedure)(user, is_standalone, pti, rsp, sent_by_ue);
}
}
LOG_FUNC_RETURN(rc);
openair3/NAS/UE/ESM/esmData.h
+2
View File
@@ -52,6 +52,7 @@ Description Defines internal private data handled by EPS Session
/* Total number of active EPS bearers */
#define ESM_DATA_EPS_BEARER_TOTAL 11
#define ESM_SAP_BUFFER_SIZE 4096
/****************************************************************************/
/************************ G L O B A L T Y P E S ************************/
@@ -172,6 +173,7 @@ typedef struct esm_data_context_s {
} pdn[ESM_DATA_PDN_MAX+1];
esm_ebr_data_t ebr;
uint8_t send_buffer[ESM_SAP_BUFFER_SIZE];
} esm_data_context_t;
/*