UE/ESM: move esm_indication_callback_t from openair2 to esm_ebr.h

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  ********************/
 /****************************************************************************/

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"
 

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  ********************/
 /****************************************************************************/

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  *******************/

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  *******************/

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  *******************/