From 3835f106592247d4564400267ebb2859e122b2ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Leroy?= <frederic.leroy@b-com.com> Date: Thu, 21 Jul 2016 15:49:32 +0200 Subject: [PATCH] UE/ESM: move esm_indication_callback_t from openair2 to esm_ebr.h --- openair2/COMMON/networkDef.h | 7 ------- openair3/NAS/UE/API/USER/user_api.c | 1 + openair3/NAS/UE/ESM/esm_ebr.h | 8 ++++++++ openair3/NAS/UE/ESM/esm_main.h | 1 + openair3/NAS/UE/nas_proc.h | 1 + openair3/NAS/UE/nas_user.h | 1 + 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/openair2/COMMON/networkDef.h b/openair2/COMMON/networkDef.h index c52a58a527..42c812baad 100644 --- a/openair2/COMMON/networkDef.h +++ b/openair2/COMMON/networkDef.h @@ -252,13 +252,6 @@ typedef struct { network_pkf_t* pkf[NET_PACKET_FILTER_MAX]; } network_tft_t; -/* - * User notification callback, executed whenever a change of status with - * respect of PDN connection or EPS bearer context is notified by the EPS - * Session Management sublayer - */ -typedef int (*esm_indication_callback_t) (int, network_pdn_state_t); - /****************************************************************************/ /******************** G L O B A L V A R I A B L E S ********************/ /****************************************************************************/ diff --git a/openair3/NAS/UE/API/USER/user_api.c b/openair3/NAS/UE/API/USER/user_api.c index 9c23646292..dd5b5758f1 100644 --- a/openair3/NAS/UE/API/USER/user_api.c +++ b/openair3/NAS/UE/API/USER/user_api.c @@ -48,6 +48,7 @@ Description Implements the API used by the NAS layer running in the UE #include "at_command.h" #include "at_response.h" #include "at_error.h" +#include "esm_ebr.h" #include "user_indication.h" diff --git a/openair3/NAS/UE/ESM/esm_ebr.h b/openair3/NAS/UE/ESM/esm_ebr.h index dd58631956..af31e95676 100644 --- a/openair3/NAS/UE/ESM/esm_ebr.h +++ b/openair3/NAS/UE/ESM/esm_ebr.h @@ -42,6 +42,7 @@ Description Defines functions used to handle state of EPS bearer contexts #include "OctetString.h" #include "networkDef.h" +#include "esmData.h" #include "nas_timer.h" @@ -56,6 +57,13 @@ Description Defines functions used to handle state of EPS bearer contexts /************************ G L O B A L T Y P E S ************************/ /****************************************************************************/ +/* + * User notification callback, executed whenever a change of status with + * respect of PDN connection or EPS bearer context is notified by the EPS + * Session Management sublayer + */ +typedef int (*esm_indication_callback_t) (int, network_pdn_state_t); + /****************************************************************************/ /******************** G L O B A L V A R I A B L E S ********************/ /****************************************************************************/ diff --git a/openair3/NAS/UE/ESM/esm_main.h b/openair3/NAS/UE/ESM/esm_main.h index d7346fdb08..d6fed970f0 100644 --- a/openair3/NAS/UE/ESM/esm_main.h +++ b/openair3/NAS/UE/ESM/esm_main.h @@ -41,6 +41,7 @@ Description Defines the EPS Session Management procedure call manager, #define __ESM_MAIN_H__ #include "networkDef.h" +#include "esm_ebr.h" /****************************************************************************/ /********************* G L O B A L C O N S T A N T S *******************/ diff --git a/openair3/NAS/UE/nas_proc.h b/openair3/NAS/UE/nas_proc.h index c66f2177fe..bf8e286cc7 100644 --- a/openair3/NAS/UE/nas_proc.h +++ b/openair3/NAS/UE/nas_proc.h @@ -41,6 +41,7 @@ Description NAS procedure call manager #include "commonDef.h" #include "networkDef.h" #include "emm_main.h" +#include "esm_ebr.h" /****************************************************************************/ /********************* G L O B A L C O N S T A N T S *******************/ diff --git a/openair3/NAS/UE/nas_user.h b/openair3/NAS/UE/nas_user.h index 584c7532f0..9cb7561816 100644 --- a/openair3/NAS/UE/nas_user.h +++ b/openair3/NAS/UE/nas_user.h @@ -41,6 +41,7 @@ Description NAS procedure functions triggered by the user #include "commonDef.h" #include "networkDef.h" #include "emm_main.h" +#include "esm_ebr.h" /****************************************************************************/ /********************* G L O B A L C O N S T A N T S *******************/ -- 2.26.2