Merge branch 'develop' into feature-127-protocol-split

openair2/X2AP/x2ap_eNB_defs.h

@@ -34,6 +34,7 @@
 #include "sctp_eNB_defs.h"
 
 #include "x2ap_ids.h"
+#include "x2ap_timers.h"
 
 #ifndef X2AP_ENB_DEFS_H_
 #define X2AP_ENB_DEFS_H_
@@ -63,7 +64,6 @@ typedef enum {
   X2AP_ENB_STATE_MAX,
 } x2ap_eNB_state_t;
 
-
 /* Served PLMN identity element */
 struct plmn_identity_s {
   uint16_t mcc;
@@ -184,6 +184,7 @@ typedef struct x2ap_eNB_instance_s {
   int              multi_sd;
 
   x2ap_id_manager  id_manager;
+  x2ap_timers_t    timers;
 } x2ap_eNB_instance_t;
 
 typedef struct {