- Update S1AP and SCTP layers to use ITTI for eNB: may broke the old version...

- Update S1AP and SCTP layers to use ITTI for eNB: may broke the old version of S1AP/SCTP (compile with USE_MME=R10 and ENABLE_ITTI=1)

pre-ci tests passed

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4342 818b1a75-f10b-46b9-bf7c-635c3b92a50f

openair-cn/S1AP/Makefile.eNB

-S1AP_DIR = $(OPENAIR3_DIR)/OPENAIRMME/S1AP
-S1AP_OBJDIR = $(OPENAIR3_DIR)/OPENAIRMME/S1AP/enb_objs
+include $(OPENAIR_TARGETS)/SIMU/USER/Makerules
+
+S1AP_OBJDIR = $(S1AP_DIR)/enb_objs
 
 ASN1MESSAGESDIR=$(S1AP_DIR)/MESSAGES
 ASN1DIR=$(ASN1MESSAGESDIR)/ASN1
@@ -26,7 +27,9 @@ libs1ap_OBJECTS = \
 	$(S1AP_OBJDIR)/s1ap_encoder.o		\
 	$(S1AP_OBJDIR)/s1ap_decoder.o		\
 	$(S1AP_OBJDIR)/s1ap_xer_print.o		\
-	s1ap_eNB_decoder.o s1ap_eNB_encoder.o	\
+	s1ap_eNB_itti_messaging.o		\
+	s1ap_eNB_decoder.o			\
+	s1ap_eNB_encoder.o			\
 	s1ap_eNB_handlers.o			\
 	s1ap_eNB_nnsf.o	s1ap_eNB_ue_context.o	\
 	s1ap_eNB_trace.o s1ap_eNB_overload.o	\
@@ -35,42 +38,30 @@ libs1ap_OBJECTS = \
 	$(addprefix MESSAGES/, $(S1AP_ASN_MODULE_SOURCES))
 
 # pull in dependency info for *existing* .o files
--include .*.d
-# -include .*.d
+-include *.d
 
 CFLAGS = 			\
+	-DENB_MODE		\
+	-DENABLE_USE_MME	\
+	-DEMIT_ASN_DEBUG=1	\
+	-DUSER_MODE		\
 	-I./MESSAGES		\
 	-I$(S1AP_OBJDIR)	\
-	-I../GTPV1-U		\
-	-I../GTPV1-U/nw-gtpv1u/shared	\
-	-I../GTPV1-U/nw-gtpv1u/include	\
-	-I../SCTP		\
-	-I../UDP		\
 	-I../UTILS		\
-	-I../UTILS/HASHTABLE     \
-	-I$(OPENAIR2_DIR)/COMMON	\
-	-I$(S1AP_DIR)		\
-	-I$(OPENAIR2_DIR)	\
-	-I$(OPENAIR2_DIR)/UTIL	\
 	$(ADD_CFLAGS)		\
 	-DENB_MODE		\
-	-DENABLE_USE_MME	\
-	-DEMIT_ASN_DEBUG_EXTERN	\
-	-DUSER_MODE		\
-	-g			\
-	-O2			\
-	-Wall			\
+	$(S1AP_CFLAGS)		\
 	-Werror=implicit-function-declaration
 
 $(libs1ap_OBJECTS): %.o : %.c
 	@echo "Compiling $<"
 	@$(CC) -c $(CFLAGS) -o $@ $<
-	@$(CC) -MM $(CFLAGS) $*.c > .$(notdir $*).d
-	@mv -f .$(notdir $*).d .$(notdir $*).d.tmp
-	@sed -e 's|.*:|$*.o:|' < .$(notdir $*).d.tmp > .$(notdir $*).d
-	@sed -e 's/.*://' -e 's/\\$$//' < .$(notdir $*).d.tmp | fmt -1 | \
-	sed -e 's/^ *//' -e 's/$$/:/' >> .$(notdir $*).d
-	@rm -f .$(notdir $*).tmp
+	@$(CC) -MM $(CFLAGS) $*.c > $*.d
+	@mv -f $*.d $*.d.tmp
+	@sed -e 's|.*:|$*.o:|' < $*.d.tmp > $*.d
+	@sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | \
+	sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
+	@rm -f $*.d.tmp
 
 $(S1AP_OBJDIR)/s1ap_ieregen.stamp: $(ASN1DIR)/$(ASN1RELDIR)/S1AP-PDU-Contents.asn $(ASN1DIR)/asn1tostruct.py
 	mkdir -p $(S1AP_OBJDIR)
@@ -87,10 +78,19 @@ libs1ap.a: $(S1AP_OBJDIR)/s1ap_ieregen.stamp $(S1AP_OBJDIR)/s1ap_asn1regen.stamp
 	@$(AR) rcs $@ $(libs1ap_OBJECTS)
 
 clean:
-	rm -f $(libs1ap_OBJECTS)
-	rm -f $(libs1ap_OBJECTS:.o=.d)
-	rm -f libs1ap.a
-	rm -f $(S1AP_OBJDIR)/s1ap_asn1regen.stamp
-	rm -f $(S1AP_OBJDIR)/s1ap_ieregen.stamp
-	rm -f $(S1AP_OBJDIR)/s1ap_decoder.c $(S1AP_OBJDIR)/s1ap_encoder.c
-	rm -f $(S1AP_OBJDIR)/s1ap_xer_print.c $(S1AP_OBJDIR)/s1ap_ies_defs.h
\ No newline at end of file
+	@$(RM_F_V) $(libs1ap_OBJECTS)
+	@$(RM_F_V) .*.d
+	@$(RM_F_V) $(addprefix MESSAGES/, $(S1AP_ASN_MODULE_SOURCES))
+	@$(RM_F_V) $(addprefix MESSAGES/, $(S1AP_ASN_MODULE_SOURCES:.o=.d))
+	@$(RM_F_V) libs1ap.a
+	@$(RM_F_V) $(S1AP_OBJDIR)/s1ap_asn1regen.stamp
+	@$(RM_F_V) $(S1AP_OBJDIR)/s1ap_ieregen.stamp
+	@$(RM_F_V) $(S1AP_OBJDIR)/s1ap_decoder.c $(S1AP_OBJDIR)/s1ap_encoder.c
+	@$(RM_F_V) $(S1AP_OBJDIR)/s1ap_xer_print.c $(S1AP_OBJDIR)/s1ap_ies_defs.h
+
+cleanall: clean
+	@$(RM_F_V) $(addprefix MESSAGES/, $(S1AP_ASN_MODULE_SOURCES:.o=.c))
+	@$(RM_F_V) $(addprefix MESSAGES/, $(S1AP_ASN_MODULE_SOURCES:.o=.h))
+
+showcflags:
+	@echo s1ap cflags: $(CFLAGS)
\ No newline at end of file

openair-cn/S1AP/s1ap_common.c

@@ -41,8 +41,9 @@
 #include "S1AP-PDU.h"
 
 int asn_debug = 0;
-int asn1_xer_print = 0;
+int asn1_xer_print = 1;
 
+#if defined(EMIT_ASN_DEBUG_EXTERN)
 inline void ASN_DEBUG(const char *fmt, ...)
 {
     if (asn_debug) {
@@ -56,6 +57,7 @@ inline void ASN_DEBUG(const char *fmt, ...)
         va_end(ap);
     }
 }
+#endif
 
 ssize_t s1ap_generate_initiating_message(
     uint8_t               **buffer,

openair-cn/S1AP/s1ap_common.h

@@ -44,7 +44,9 @@
 // extern int asn_debug_indent;
 extern int asn_debug;
 
+#if defined(EMIT_ASN_DEBUG_EXTERN)
 inline void ASN_DEBUG(const char *fmt, ...);
+#endif
 
 #include "Criticality.h"
 #include "Presence.h"
@@ -400,9 +402,8 @@ extern int asn_debug;
 extern int asn1_xer_print;
 
 #if defined(ENB_MODE)
-# include "mme_sim.h"
 # include "UTIL/LOG/log.h"
-# include "eNB_default_values.h"
+# include "s1ap_eNB_default_values.h"
 # define S1AP_ERROR(x, args...) LOG_E(S1AP, x, ##args)
 # define S1AP_WARN(x, args...)  LOG_W(S1AP, x, ##args)
 # define S1AP_TRAF(x, args...)  LOG_T(S1AP, x, ##args)
@@ -420,19 +421,18 @@ struct s1ap_message_s;
 
 /** \brief Function callback prototype.
  **/
-#if defined(ENB_MODE)
-typedef int (*s1ap_message_decoded_callback)(
-    eNB_mme_desc_t *eNB_desc_p,
-    sctp_queue_item_t *packet_p,
-    struct s1ap_message_s *message_p
-);
-#else
+// typedef int (*s1ap_message_decoded_callback)(
+//     eNB_mme_desc_t *eNB_desc_p,
+//     sctp_queue_item_t *packet_p,
+//     struct s1ap_message_s *message_p
+// );
+
 typedef int (*s1ap_message_decoded_callback)(
-    uint32_t assocId,
+    uint32_t               assoc_id,
     uint32_t               stream,
     struct s1ap_message_s *message_p
 );
-#endif
+
 /** \brief Encode a successfull outcome message
  \param buffer pointer to buffer in which data will be encoded
  \param length pointer to the length of buffer

openair-cn/S1AP/s1ap_eNB.h

@@ -31,101 +31,18 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include "tree.h"
-#include "queue.h"
-
-#include "mme_sim.h"
-#include "s1ap_eNB_defs.h"
+/** @defgroup _s1ap_impl_ S1AP Layer Reference Implementation for eNB
+ * @ingroup _ref_implementation_
+ * @{
+ */
 
 #ifndef S1AP_ENB_H_
 #define S1AP_ENB_H_
 
-/* Served PLMN identity element */
-struct plmn_identity_s {
-    uint16_t mcc;
-    uint16_t mnc;
-    STAILQ_ENTRY(plmn_identity_s) next;
-};
-
-/* Served group id element */
-struct served_group_id_s {
-    uint16_t mme_group_id;
-    STAILQ_ENTRY(served_group_id_s) next;
-};
-
-/* Served mme code for a particular MME */
-struct mme_code_s {
-    uint8_t mme_code;
-    STAILQ_ENTRY(mme_code_s) next;
-};
-
-/* Served gummei element */
-struct served_gummei_s {
-    /* Number of MME served PLMNs */
-    uint8_t nb_served_plmns;
-    /* List of served PLMNs by MME */
-    STAILQ_HEAD(served_plmns_s, plmn_identity_s) served_plmns;
-
-    /* Number of group id in list */
-    uint8_t nb_group_id;
-    /* Served group id list */
-    STAILQ_HEAD(served_group_ids_s, served_group_id_s) served_group_ids;
+void *s1ap_eNB_task(void *arg);
 
-    /* Number of MME code */
-    uint8_t nb_mme_code;
-    /* MME Code to uniquely identify an MME within an MME pool area */
-    STAILQ_HEAD(mme_codes_s, mme_code_s) mme_codes;
-
-    /* Next GUMMEI element */
-    STAILQ_ENTRY(served_gummei_s) next;
-};
-
-/* This structure describes association of a eNB to a MME */
-typedef struct s1ap_eNB_mme_data_s {
-    /* This is the optional name provided by the MME */
-    char *mme_name;
-
-    /* Remote MME IP addr */
-    char *ip_addr;
-
-    /* List of served GUMMEI per MME. There is one GUMMEI per RAT with a max
-     * number of 8 RATs but in our case only one is used. The LTE related pool
-     * configuration is included on the first place in the list.
-     */
-    STAILQ_HEAD(served_gummeis_s, served_gummei_s) served_gummei;
+#endif /* S1AP_ENB_H_ */
 
-    /* Relative processing capacity of an MME with respect to the other MMEs
-     * in the pool in order to load-balance MMEs within a pool as defined
-     * in TS 23.401.
+/**
+ * @}
  */
-    uint8_t relative_mme_capacity;
-
-    /* Current MME overload information (if any). */
-    s1ap_overload_state_t overload_state;
-    /* Current eNB->MME S1AP association state */
-    s1ap_eNB_state_t state;
-
-    /* SCTP related data for this MME */
-    sctp_data_t sctp_data;
-    /* Next usable stream for UE signalling */
-    int32_t nextstream;
-
-    /* MME descriptors tree, ordered by sctp assoc id */
-    RB_ENTRY(s1ap_eNB_mme_data_s) entry;
-} s1ap_eNB_mme_data_t;
-
-inline int s1ap_eNB_compare_assoc_id(
-    struct s1ap_eNB_mme_data_s *p1, struct s1ap_eNB_mme_data_s *p2);
-
-/* Generate the tree management functions */
-RB_PROTOTYPE(s1ap_mme_map, s1ap_eNB_mme_data_s, entry,
-             s1ap_eNB_compare_assoc_id);
-
-struct s1ap_eNB_mme_data_s *s1ap_eNB_get_MME(eNB_mme_desc_t *eNB_desc_p,
-        uint32_t assocId);
-
-int s1ap_eNB_init(eNB_mme_desc_t *eNB_desc_p,
-                  char *local_ip_addr[],  int nb_local_ip,
-                  char *remote_ip_addr[], int nb_remote_ip);
-
-#endif /* S1AP_ENB_H_ */

openair-cn/S1AP/s1ap_eNB_decoder.c

@@ -106,7 +106,8 @@ static int s1ap_eNB_decode_unsuccessful_outcome(s1ap_message *message,
     return -1;
 }
 
-int s1ap_eNB_decode_pdu(s1ap_message *message, uint8_t *buffer, uint32_t length)
+int s1ap_eNB_decode_pdu(s1ap_message *message, const uint8_t * const buffer,
+                        const uint32_t length)
 {
     S1AP_PDU_t  pdu;
     S1AP_PDU_t *pdu_p = &pdu;

openair-cn/S1AP/s1ap_eNB_decoder.h

@@ -34,7 +34,7 @@
 #ifndef S1AP_ENB_DECODER_H_
 #define S1AP_ENB_DECODER_H_
 
-int s1ap_eNB_decode_pdu(s1ap_message *message, uint8_t *buffer, uint32_t length)
-__attribute__ ((warn_unused_result));
+int s1ap_eNB_decode_pdu(s1ap_message *message, const uint8_t * const buffer,
+                        const uint32_t length) __attribute__ ((warn_unused_result));
 
 #endif /* S1AP_ENB_DECODER_H_ */

openair-cn/S1AP/s1ap_eNB_default_values.h

+#ifndef S1AP_ENB_DEFAULT_VALUES_H_
+#define S1AP_ENB_DEFAULT_VALUES_H_
+
+#define ENB_TAC (0)
+#define ENB_MCC (208)
+#define ENB_MNC (34)
+
+#define ENB_NAME        "Eurecom ENB"
+#define ENB_NAME_FORMAT (ENB_NAME" %u")
+
+#define S1AP_PORT_NUMBER        (36412)
+#define S1AP_SCTP_PPID          (18)
+
+#define X2AP_PORT_NUMBER        (36422)
+#define X2AP_SCTP_PPID          (27)
+
+#define SCTP_OUT_STREAMS        (64)
+#define SCTP_IN_STREAMS         (64)
+#define SCTP_MAX_ATTEMPTS       (5)
+#define SCTP_RECV_BUFFER_SIZE   (1024)
+
+#endif /* S1AP_ENB_DEFAULT_VALUES_H_ */

openair-cn/S1AP/s1ap_eNB_handlers.h

@@ -31,19 +31,7 @@
 #ifndef S1AP_ENB_HANDLERS_H_
 #define S1AP_ENB_HANDLERS_H_
 
-int s1ap_eNB_handle_message(eNB_mme_desc_t *eNB_desc_p,
-                            sctp_queue_item_t *packet_p);
-
-int s1ap_eNB_handle_s1_setup_response(eNB_mme_desc_t *eNB_desc_p,
-                                      sctp_queue_item_t *packet_p,
-                                      struct s1ap_message_s *message);
-
-int s1ap_eNB_handle_s1_setup_failure(eNB_mme_desc_t *eNB_desc_p,
-                                     sctp_queue_item_t *packet_p,
-                                     struct s1ap_message_s *message);
-
-int s1ap_eNB_handle_initial_context_request(eNB_mme_desc_t *eNB_desc_p,
-        sctp_queue_item_t *packet_p,
-        struct s1ap_message_s *message_p);
+int s1ap_eNB_handle_message(uint32_t assoc_id, int32_t stream,
+                            const uint8_t * const data, const uint32_t data_length);
 
 #endif /* S1AP_ENB_HANDLERS_H_ */

openair-cn/S1AP/s1ap_eNB_itti_messaging.c

+#include "intertask_interface.h"
+
+#include "s1ap_eNB_itti_messaging.h"
+
+void s1ap_eNB_itti_send_sctp_data_req(int32_t assoc_id, uint8_t *buffer,
+                                      uint32_t buffer_length, uint16_t stream)
+{
+    MessageDef      *message_p;
+    sctp_data_req_t *sctp_data_req;
+
+    message_p = itti_alloc_new_message(TASK_S1AP, SCTP_DATA_REQ);
+
+    sctp_data_req = &message_p->msg.sctp_data_req;
+
+    sctp_data_req->assoc_id      = assoc_id;
+    sctp_data_req->buffer        = buffer;
+    sctp_data_req->buffer_length = buffer_length;
+    sctp_data_req->stream        = stream;
+
+    itti_send_msg_to_task(TASK_SCTP, INSTANCE_DEFAULT, message_p);
+}

openair-cn/S1AP/s1ap_eNB_itti_messaging.h

+#ifndef S1AP_ENB_ITTI_MESSAGING_H_
+#define S1AP_ENB_ITTI_MESSAGING_H_
+
+void s1ap_eNB_itti_send_sctp_data_req(int32_t assoc_id, uint8_t *buffer,
+                                      uint32_t buffer_length, uint16_t stream);
+
+#endif /* S1AP_ENB_ITTI_MESSAGING_H_ */

openair-cn/S1AP/s1ap_eNB_management_procedures.c

@@ -32,7 +32,10 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#include "mme_sim.h"
+#include "intertask_interface.h"
+
+#include "assertions.h"
+// #include "conversions.h"
 
 #include "s1ap_common.h"
 #include "s1ap_ies_defs.h"
@@ -44,72 +47,69 @@
 
 #include "sctp_primitives_client.h"
 
-#include "assertions.h"
-#include "conversions.h"
-
-int s1ap_eNB_ue_capabilities(eNB_mme_desc_t         *eNB_desc_p,
-                             s1ap_ue_cap_info_ind_t *ue_cap_info_ind_p)
-{
-    struct s1ap_eNB_ue_context_s *ue_context_p;
-    UECapabilityInfoIndicationIEs_t *ue_cap_info_ind_ies_p;
-
-    s1ap_message  message;
-
-    uint8_t  *buffer;
-    uint32_t length;
-    int      ret = -1;
-
-    DevAssert(ue_cap_info_ind_p != NULL);
-    DevAssert(eNB_desc_p != NULL);
-
-    if ((ue_context_p = s1ap_eNB_get_ue_context(eNB_desc_p, ue_cap_info_ind_p->eNB_ue_s1ap_id)) == NULL)
-    {
-        /* The context for this eNB ue s1ap id doesn't exist in the map of eNB UEs */
-        S1AP_WARN("Failed to find ue context associated with eNB ue s1ap id: %u\n",
-                  ue_cap_info_ind_p->eNB_ue_s1ap_id);
-        return -1;
-    }
-
-    /* UE capabilities message can occur either during an s1ap connected state
-     * or during initial attach (for example: NAS authentication).
-     */
-    if (!(ue_context_p->ue_state == S1AP_UE_CONNECTED ||
-        ue_context_p->ue_state == S1AP_UE_WAITING_CSR))
-    {
-        S1AP_WARN("You are attempting to send NAS data over non-connected "
-        "eNB ue s1ap id: %u, current state: %d\n",
-        ue_cap_info_ind_p->eNB_ue_s1ap_id, ue_context_p->ue_state);
-        return -1;
-    }
-
-    /* Prepare the S1AP message to encode */
-    memset(&message, 0, sizeof(s1ap_message));
-
-    message.direction = S1AP_PDU_PR_initiatingMessage;
-    message.procedureCode = ProcedureCode_id_UECapabilityInfoIndication;
-
-    ue_cap_info_ind_ies_p = &message.msg.ueCapabilityInfoIndicationIEs;
-
-    ue_cap_info_ind_ies_p->ueRadioCapability.buf = ue_cap_info_ind_p->ue_radio_cap.buffer;
-    ue_cap_info_ind_ies_p->ueRadioCapability.size = ue_cap_info_ind_p->ue_radio_cap.length;
-
-    ue_cap_info_ind_ies_p->eNB_UE_S1AP_ID = ue_cap_info_ind_p->eNB_ue_s1ap_id;
-    ue_cap_info_ind_ies_p->mme_ue_s1ap_id = ue_context_p->mme_ue_s1ap_id;
-
-    if (s1ap_eNB_encode_pdu(&message, &buffer, &length) < 0) {
-        /* Encode procedure has failed... */
-        S1AP_ERROR("Failed to encode UE capabilities indication\n");
-        return -1;
-    }
-
-    /* UE associated signalling -> use the allocated stream */
-    if ((ret = sctp_send_msg(&ue_context_p->mme_ref->sctp_data, S1AP_SCTP_PPID,
-        ue_context_p->stream, buffer, length)) < 0)
-    {
-        S1AP_ERROR("[SCTP %d] Failed to send message over SCTP: %d\n",
-                   ue_context_p->mme_ref->sctp_data.assoc_id, ret);
-    }
-
-    free(buffer);
-    return ret;
-}
+// int s1ap_eNB_ue_capabilities(eNB_mme_desc_t         *eNB_desc_p,
+//                              s1ap_ue_cap_info_ind_t *ue_cap_info_ind_p)
+// {
+//     struct s1ap_eNB_ue_context_s *ue_context_p;
+//     UECapabilityInfoIndicationIEs_t *ue_cap_info_ind_ies_p;
+// 
+//     s1ap_message  message;
+// 
+//     uint8_t  *buffer;
+//     uint32_t length;
+//     int      ret = -1;
+// 
+//     DevAssert(ue_cap_info_ind_p != NULL);
+//     DevAssert(eNB_desc_p != NULL);
+// 
+//     if ((ue_context_p = s1ap_eNB_get_ue_context(eNB_desc_p, ue_cap_info_ind_p->eNB_ue_s1ap_id)) == NULL)
+//     {
+//         /* The context for this eNB ue s1ap id doesn't exist in the map of eNB UEs */
+//         S1AP_WARN("Failed to find ue context associated with eNB ue s1ap id: %u\n",
+//                   ue_cap_info_ind_p->eNB_ue_s1ap_id);
+//         return -1;
+//     }
+// 
+//     /* UE capabilities message can occur either during an s1ap connected state
+//      * or during initial attach (for example: NAS authentication).
+//      */
+//     if (!(ue_context_p->ue_state == S1AP_UE_CONNECTED ||
+//         ue_context_p->ue_state == S1AP_UE_WAITING_CSR))
+//     {
+//         S1AP_WARN("You are attempting to send NAS data over non-connected "
+//         "eNB ue s1ap id: %u, current state: %d\n",
+//         ue_cap_info_ind_p->eNB_ue_s1ap_id, ue_context_p->ue_state);
+//         return -1;
+//     }
+// 
+//     /* Prepare the S1AP message to encode */
+//     memset(&message, 0, sizeof(s1ap_message));
+// 
+//     message.direction = S1AP_PDU_PR_initiatingMessage;
+//     message.procedureCode = ProcedureCode_id_UECapabilityInfoIndication;
+// 
+//     ue_cap_info_ind_ies_p = &message.msg.ueCapabilityInfoIndicationIEs;
+// 
+//     ue_cap_info_ind_ies_p->ueRadioCapability.buf = ue_cap_info_ind_p->ue_radio_cap.buffer;
+//     ue_cap_info_ind_ies_p->ueRadioCapability.size = ue_cap_info_ind_p->ue_radio_cap.length;
+// 
+//     ue_cap_info_ind_ies_p->eNB_UE_S1AP_ID = ue_cap_info_ind_p->eNB_ue_s1ap_id;
+//     ue_cap_info_ind_ies_p->mme_ue_s1ap_id = ue_context_p->mme_ue_s1ap_id;
+// 
+//     if (s1ap_eNB_encode_pdu(&message, &buffer, &length) < 0) {
+//         /* Encode procedure has failed... */
+//         S1AP_ERROR("Failed to encode UE capabilities indication\n");
+//         return -1;
+//     }
+// 
+//     /* UE associated signalling -> use the allocated stream */
+//     if ((ret = sctp_send_msg(&ue_context_p->mme_ref->sctp_data, S1AP_SCTP_PPID,
+//         ue_context_p->stream, buffer, length)) < 0)
+//     {
+//         S1AP_ERROR("[SCTP %d] Failed to send message over SCTP: %d\n",
+//                    ue_context_p->mme_ref->sctp_data.assoc_id, ret);
+//     }
+// 
+//     free(buffer);
+//     return ret;
+// }

openair-cn/S1AP/s1ap_eNB_management_procedures.h

@@ -31,7 +31,7 @@
 #ifndef S1AP_ENB_MANAGEMENT_PROCEDURES_H_
 #define S1AP_ENB_MANAGEMENT_PROCEDURES_H_
 
-int s1ap_eNB_ue_capabilities(eNB_mme_desc_t         *eNB_desc_p,
-                             s1ap_ue_cap_info_ind_t *ue_cap_info_ind_p);
+// int s1ap_eNB_ue_capabilities(eNB_mme_desc_t         *eNB_desc_p,
+//                              s1ap_ue_cap_info_ind_t *ue_cap_info_ind_p);
 
 #endif /* S1AP_ENB_MANAGEMENT_PROCEDURES_H_ */

openair-cn/S1AP/s1ap_eNB_nas_procedures.h

@@ -31,14 +31,11 @@
 #ifndef S1AP_ENB_NAS_PROCEDURES_H_
 #define S1AP_ENB_NAS_PROCEDURES_H_
 
-int s1ap_eNB_nas_uplink(eNB_mme_desc_t *eNB_desc_p,
-                        s1ap_nas_uplink_t *nas_uplink_p);
-
-int s1ap_eNB_handle_nas_downlink(eNB_mme_desc_t *eNB_desc_p,
-                                 sctp_queue_item_t *packet_p,
+int s1ap_eNB_handle_nas_downlink(uint32_t               assoc_id,
+                                 uint32_t               stream,
                                  struct s1ap_message_s *message_p);
 
-int s1ap_eNB_initial_ctxt_resp(eNB_mme_desc_t                 *eNB_desc_p,
-                               s1ap_initial_ctxt_setup_resp_t *initial_ctxt_resp_p);
+// int s1ap_eNB_initial_ctxt_resp(eNB_mme_desc_t                 *eNB_desc_p,
+//                                s1ap_initial_ctxt_setup_resp_t *initial_ctxt_resp_p);
 
 #endif /* S1AP_ENB_NAS_PROCEDURES_H_ */

openair-cn/S1AP/s1ap_eNB_nnsf.c

@@ -38,13 +38,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "mme_sim.h"
+#include "intertask_interface.h"
 
-#include "s1ap_eNB.h"
+#include "s1ap_common.h"
+
+#include "s1ap_eNB_defs.h"
 #include "s1ap_eNB_nnsf.h"
 
 struct s1ap_eNB_mme_data_s *
-s1ap_eNB_nnsf_select_mme_by_mme_code(eNB_mme_desc_t            *eNB_desc_p,
+s1ap_eNB_nnsf_select_mme_by_mme_code(s1ap_eNB_instance_t       *instance_p,
                                      rrc_establishment_cause_t  cause,
                                      uint8_t                    mme_code)
 {
@@ -52,7 +54,7 @@ s1ap_eNB_nnsf_select_mme_by_mme_code(eNB_mme_desc_t            *eNB_desc_p,
     struct s1ap_eNB_mme_data_s *mme_highest_capacity_p = NULL;
     uint8_t current_capacity = 0;
 
-    RB_FOREACH(mme_data_p, s1ap_mme_map, &eNB_desc_p->s1ap_mme_head) {
+    RB_FOREACH(mme_data_p, s1ap_mme_map, &instance_p->s1ap_mme_head) {
         struct served_gummei_s *gummei_p = NULL;
 
         if (mme_data_p->state != S1AP_ENB_STATE_CONNECTED) {
@@ -112,7 +114,7 @@ s1ap_eNB_nnsf_select_mme_by_mme_code(eNB_mme_desc_t            *eNB_desc_p,
 }
 
 struct s1ap_eNB_mme_data_s *
-s1ap_eNB_nnsf_select_mme_by_gummei(eNB_mme_desc_t            *eNB_desc_p,
+s1ap_eNB_nnsf_select_mme_by_gummei(s1ap_eNB_instance_t       *instance_p,
                                    rrc_establishment_cause_t  cause,
                                    gummei_t                   gummei)
 {
@@ -120,7 +122,7 @@ s1ap_eNB_nnsf_select_mme_by_gummei(eNB_mme_desc_t            *eNB_desc_p,
     struct s1ap_eNB_mme_data_s *mme_highest_capacity_p = NULL;
     uint8_t current_capacity = 0;
 
-    RB_FOREACH(mme_data_p, s1ap_mme_map, &eNB_desc_p->s1ap_mme_head) {
+    RB_FOREACH(mme_data_p, s1ap_mme_map, &instance_p->s1ap_mme_head) {
         struct served_gummei_s *gummei_p = NULL;
 
         if (mme_data_p->state != S1AP_ENB_STATE_CONNECTED) {

openair-cn/S1AP/s1ap_eNB_nnsf.h

@@ -37,12 +37,12 @@
 #define S1AP_ENB_NNSF_H_
 
 struct s1ap_eNB_mme_data_s*
-s1ap_eNB_nnsf_select_mme_by_mme_code(eNB_mme_desc_t            *eNB_desc_p,
+s1ap_eNB_nnsf_select_mme_by_mme_code(s1ap_eNB_instance_t       *instance_p,
                                      rrc_establishment_cause_t  cause,
                                      uint8_t                    mme_code);
 
 struct s1ap_eNB_mme_data_s*
-s1ap_eNB_nnsf_select_mme_by_gummei(eNB_mme_desc_t            *eNB_desc_p,
+s1ap_eNB_nnsf_select_mme_by_gummei(s1ap_eNB_instance_t       *instance_p,
                                    rrc_establishment_cause_t  cause,
                                    gummei_t                   gummei);
 

openair-cn/S1AP/s1ap_eNB_overload.c

@@ -39,6 +39,8 @@
 #include <stdlib.h>
 #include <stdint.h>
 
+#include "intertask_interface.h"
+
 #include "s1ap_common.h"
 #include "s1ap_ies_defs.h"
 #include "s1ap_eNB_defs.h"
@@ -52,58 +54,69 @@
 
 #include "assertions.h"
 
-int s1ap_eNB_handle_overload_start(eNB_mme_desc_t *eNB_desc_p,
-                                   sctp_queue_item_t *packet_p,
+// int s1ap_eNB_handle_overload_start(eNB_mme_desc_t *eNB_desc_p,
+//                                    sctp_queue_item_t *packet_p,
+//                                    struct s1ap_message_s *message_p)
+int s1ap_eNB_handle_overload_start(uint32_t               assoc_id,
+                                   uint32_t               stream,
                                    struct s1ap_message_s *message_p)
 {
     OverloadStartIEs_t  *overload_start_p;
     s1ap_eNB_mme_data_t *mme_desc_p;
 
-    overload_start_p = &message_p->msg.overloadStartIEs;
-
-    DevCheck(overload_start_p->overloadResponse.present ==
-             OverloadResponse_PR_overloadAction,
-             OverloadResponse_PR_overloadAction, 0, 0);
+    DevAssert(message_p != NULL);
 
-    /* Non UE-associated signalling -> stream 0 */
-    DevCheck(packet_p->local_stream == 0, packet_p->local_stream,
-             packet_p->remote_port, packet_p->assoc_id);
+    overload_start_p = &message_p->msg.overloadStartIEs;
 
-    if ((mme_desc_p = s1ap_eNB_get_MME(eNB_desc_p, packet_p->assoc_id)) == NULL) {
-        /* No MME context associated */
-        return -1;
-    }
-
-    /* Mark the MME as overloaded and set the overload state according to
-     * the value received.
-     */
-    mme_desc_p->state = S1AP_ENB_OVERLOAD;
-    mme_desc_p->overload_state =
-        overload_start_p->overloadResponse.choice.overloadAction;
+//     DevCheck(overload_start_p->overloadResponse.present ==
+//              OverloadResponse_PR_overloadAction,
+//              OverloadResponse_PR_overloadAction, 0, 0);
+// 
+//     /* Non UE-associated signalling -> stream 0 */
+//     DevCheck(packet_p->local_stream == 0, packet_p->local_stream,
+//              packet_p->remote_port, packet_p->assoc_id);
+// 
+//     if ((mme_desc_p = s1ap_eNB_get_MME(eNB_desc_p, packet_p->assoc_id)) == NULL) {
+//         /* No MME context associated */
+//         return -1;
+//     }
+// 
+//     /* Mark the MME as overloaded and set the overload state according to
+//      * the value received.
+//      */
+//     mme_desc_p->state = S1AP_ENB_OVERLOAD;
+//     mme_desc_p->overload_state =
+//         overload_start_p->overloadResponse.choice.overloadAction;
 
     return 0;
 }
 
-int s1ap_eNB_handle_overload_stop(eNB_mme_desc_t *eNB_desc_p,
-                                  sctp_queue_item_t *packet_p,
+int s1ap_eNB_handle_overload_stop(uint32_t               assoc_id,
+                                  uint32_t               stream,
                                   struct s1ap_message_s *message_p)
+// int s1ap_eNB_handle_overload_stop(eNB_mme_desc_t *eNB_desc_p,
+//                                   sctp_queue_item_t *packet_p,
+//                                   struct s1ap_message_s *message_p)
 {
     /* We received Overload stop message, meaning that the MME is no more
      * overloaded. This is an empty message, with only message header and no
      * Information Element.
      */
-    s1ap_eNB_mme_data_t *mme_desc_p;
-
-    /* Non UE-associated signalling -> stream 0 */
-    DevCheck(packet_p->local_stream == 0, packet_p->local_stream,
-             packet_p->remote_port, packet_p->assoc_id);
-
-    if ((mme_desc_p = s1ap_eNB_get_MME(eNB_desc_p, packet_p->assoc_id)) == NULL) {
-        /* No MME context associated */
-        return -1;
-    }
 
-    mme_desc_p->state = S1AP_ENB_STATE_CONNECTED;
-    mme_desc_p->overload_state = S1AP_NO_OVERLOAD;
+    DevAssert(message_p != NULL);
+
+//     s1ap_eNB_mme_data_t *mme_desc_p;
+// 
+//     /* Non UE-associated signalling -> stream 0 */
+//     DevCheck(packet_p->local_stream == 0, packet_p->local_stream,
+//              packet_p->remote_port, packet_p->assoc_id);
+// 
+//     if ((mme_desc_p = s1ap_eNB_get_MME(eNB_desc_p, packet_p->assoc_id)) == NULL) {
+//         /* No MME context associated */
+//         return -1;
+//     }
+// 
+//     mme_desc_p->state = S1AP_ENB_STATE_CONNECTED;
+//     mme_desc_p->overload_state = S1AP_NO_OVERLOAD;
     return 0;
 }

openair-cn/S1AP/s1ap_eNB_overload.h

@@ -34,15 +34,21 @@
 /**
  * \brief Handle an overload start message
  **/
-int s1ap_eNB_handle_overload_start(eNB_mme_desc_t *eNB_desc_p,
-                                   sctp_queue_item_t *packet_p,
+// int s1ap_eNB_handle_overload_start(eNB_mme_desc_t *eNB_desc_p,
+//                                    sctp_queue_item_t *packet_p,
+//                                    struct s1ap_message_s *message_p);
+int s1ap_eNB_handle_overload_start(uint32_t               assoc_id,
+                                   uint32_t               stream,
                                    struct s1ap_message_s *message_p);
 
 /**
  * \brief Handle an overload stop message
  **/
-int s1ap_eNB_handle_overload_stop(eNB_mme_desc_t *eNB_desc_p,
-                                  sctp_queue_item_t *packet_p,
+// int s1ap_eNB_handle_overload_stop(eNB_mme_desc_t *eNB_desc_p,
+//                                   sctp_queue_item_t *packet_p,
+//                                   struct s1ap_message_s *message_p);
+int s1ap_eNB_handle_overload_stop(uint32_t               assoc_id,
+                                  uint32_t               stream,
                                   struct s1ap_message_s *message_p);
 
 #endif /* S1AP_ENB_OVERLOAD_H_ */

openair-cn/S1AP/s1ap_eNB_trace.c

@@ -28,6 +28,12 @@
 
 *******************************************************************************/
 
+#include <stdint.h>
+
+#include "intertask_interface.h"
+
+#include "s1ap_eNB_default_values.h"
+
 #include "s1ap_common.h"
 #include "s1ap_ies_defs.h"
 #include "s1ap_eNB_defs.h"
@@ -37,84 +43,90 @@
 #include "s1ap_eNB_encoder.h"
 #include "s1ap_eNB_trace.h"
 
-#include "eNB_default_values.h"
-
 #include "sctp_primitives_client.h"
 
 #include "assertions.h"
 
-int s1ap_eNB_generate_trace_failure(sctp_data_t        *sctp_data_p,
-                                    int32_t             stream,
-                                    uint32_t            eNB_ue_s1ap_id,
-                                    uint32_t            mme_ue_s1ap_id,
-                                    E_UTRAN_Trace_ID_t *trace_id,
-                                    Cause_t            *cause_p)
-{
-    s1ap_message message;
-    TraceFailureIndicationIEs_t *trace_failure_p;
-    uint8_t  *buffer;
-    uint32_t  length;
-    int       ret;
-
-    DevAssert(sctp_data_p != NULL);
-
-    memset(&message, 0, sizeof(s1ap_message));
-
-    trace_failure_p = &message.msg.traceFailureIndicationIEs;
-
-    trace_failure_p->mme_ue_s1ap_id = mme_ue_s1ap_id;
-    trace_failure_p->eNB_UE_S1AP_ID = eNB_ue_s1ap_id;
-
-    memcpy(&trace_failure_p->e_UTRAN_Trace_ID, trace_id, sizeof(E_UTRAN_Trace_ID_t));
-    memcpy(&trace_failure_p->cause, cause_p, sizeof(Cause_t));
-
-    if (s1ap_eNB_encode_pdu(&message, &buffer, &length) < 0) {
-        return -1;
-    }
-    if ((ret = sctp_send_msg(sctp_data_p, S1AP_SCTP_PPID,
-                             stream, buffer, length)) < 0) {
-        S1AP_ERROR("Failed to send Trace failure\n");
-    }
-    free(buffer);
-    return ret;
-}
-
-int s1ap_eNB_handle_trace_start(eNB_mme_desc_t *eNB_desc_p,
-                                sctp_queue_item_t *packet_p,
+// int s1ap_eNB_generate_trace_failure(sctp_data_t        *sctp_data_p,
+//                                     int32_t             stream,
+//                                     uint32_t            eNB_ue_s1ap_id,
+//                                     uint32_t            mme_ue_s1ap_id,
+//                                     E_UTRAN_Trace_ID_t *trace_id,
+//                                     Cause_t            *cause_p)
+// {
+//     s1ap_message message;
+//     TraceFailureIndicationIEs_t *trace_failure_p;
+//     uint8_t  *buffer;
+//     uint32_t  length;
+//     int       ret;
+// 
+//     DevAssert(sctp_data_p != NULL);
+// 
+//     memset(&message, 0, sizeof(s1ap_message));
+// 
+//     trace_failure_p = &message.msg.traceFailureIndicationIEs;
+// 
+//     trace_failure_p->mme_ue_s1ap_id = mme_ue_s1ap_id;
+//     trace_failure_p->eNB_UE_S1AP_ID = eNB_ue_s1ap_id;
+// 
+//     memcpy(&trace_failure_p->e_UTRAN_Trace_ID, trace_id, sizeof(E_UTRAN_Trace_ID_t));
+//     memcpy(&trace_failure_p->cause, cause_p, sizeof(Cause_t));
+// 
+//     if (s1ap_eNB_encode_pdu(&message, &buffer, &length) < 0) {
+//         return -1;
+//     }
+//     if ((ret = sctp_send_msg(sctp_data_p, S1AP_SCTP_PPID,
+//                              stream, buffer, length)) < 0) {
+//         S1AP_ERROR("Failed to send Trace failure\n");
+//     }
+//     free(buffer);
+//     return ret;
+// }
+
+int s1ap_eNB_handle_trace_start(uint32_t               assoc_id,
+                                uint32_t               stream,
                                 struct s1ap_message_s *message_p)
+// int s1ap_eNB_handle_trace_start(eNB_mme_desc_t *eNB_desc_p,
+//                                 sctp_queue_item_t *packet_p,
+//                                 struct s1ap_message_s *message_p)
 {
     TraceStartIEs_t              *trace_start_p;
     struct s1ap_eNB_ue_context_s *ue_desc_p;
 
+    DevAssert(message_p != NULL);
+
     trace_start_p = &message_p->msg.traceStartIEs;
 
-    if ((ue_desc_p = s1ap_eNB_get_ue_context(eNB_desc_p,
-                     trace_start_p->eNB_UE_S1AP_ID)) == NULL) {
-        /* Could not find context associated with this eNB_ue_s1ap_id -> generate
-         * trace failure indication.
-         */
-        struct s1ap_eNB_mme_data_s *mme_ref_p;
-        E_UTRAN_Trace_ID_t trace_id;
-        Cause_t cause;
-
-        memset(&trace_id, 0, sizeof(E_UTRAN_Trace_ID_t));
-        memset(&cause, 0, sizeof(Cause_t));
-        mme_ref_p = s1ap_eNB_get_MME(eNB_desc_p, packet_p->assoc_id);
-
-        cause.present = Cause_PR_radioNetwork;
-        cause.choice.radioNetwork = CauseRadioNetwork_unknown_pair_ue_s1ap_id;
-
-        return s1ap_eNB_generate_trace_failure(&mme_ref_p->sctp_data,
-                                               packet_p->local_stream,
-                                               trace_start_p->eNB_UE_S1AP_ID,
-                                               trace_start_p->mme_ue_s1ap_id, &trace_id, &cause);
-    }
+//     if ((ue_desc_p = s1ap_eNB_get_ue_context(eNB_desc_p,
+//                      trace_start_p->eNB_UE_S1AP_ID)) == NULL) {
+//         /* Could not find context associated with this eNB_ue_s1ap_id -> generate
+//          * trace failure indication.
+//          */
+//         struct s1ap_eNB_mme_data_s *mme_ref_p;
+//         E_UTRAN_Trace_ID_t trace_id;
+//         Cause_t cause;
+// 
+//         memset(&trace_id, 0, sizeof(E_UTRAN_Trace_ID_t));
+//         memset(&cause, 0, sizeof(Cause_t));
+//         mme_ref_p = s1ap_eNB_get_MME(eNB_desc_p, packet_p->assoc_id);
+// 
+//         cause.present = Cause_PR_radioNetwork;
+//         cause.choice.radioNetwork = CauseRadioNetwork_unknown_pair_ue_s1ap_id;
+// 
+//         return s1ap_eNB_generate_trace_failure(&mme_ref_p->sctp_data,
+//                                                packet_p->local_stream,
+//                                                trace_start_p->eNB_UE_S1AP_ID,
+//                                                trace_start_p->mme_ue_s1ap_id, &trace_id, &cause);
+//     }
     return 0;
 }
 
-int s1ap_eNB_handle_deactivate_trace(eNB_mme_desc_t *eNB_desc_p,
-                                     sctp_queue_item_t *packet_p,
+int s1ap_eNB_handle_deactivate_trace(uint32_t               assoc_id,
+                                     uint32_t               stream,
                                      struct s1ap_message_s *message_p)
+// int s1ap_eNB_handle_deactivate_trace(eNB_mme_desc_t *eNB_desc_p,
+//                                      sctp_queue_item_t *packet_p,
+//                                      struct s1ap_message_s *message_p)
 {
     DeactivateTraceIEs_t *deactivate_trace_p;
 

openair-cn/S1AP/s1ap_eNB_trace.h

@@ -31,19 +31,25 @@
 #ifndef S1AP_ENB_TRACE_H_
 #define S1AP_ENB_TRACE_H_
 
-int s1ap_eNB_generate_trace_failure(sctp_data_t        *sctp_data_p,
-                                    int32_t             stream,
-                                    uint32_t            eNB_ue_s1ap_id,
-                                    uint32_t            mme_ue_s1ap_id,
-                                    E_UTRAN_Trace_ID_t *trace_id,
-                                    Cause_t            *cause_p);
-
-int s1ap_eNB_handle_trace_start(eNB_mme_desc_t *eNB_desc_p,
-                                sctp_queue_item_t *packet_p,
+// int s1ap_eNB_generate_trace_failure(sctp_data_t        *sctp_data_p,
+//                                     int32_t             stream,
+//                                     uint32_t            eNB_ue_s1ap_id,
+//                                     uint32_t            mme_ue_s1ap_id,
+//                                     E_UTRAN_Trace_ID_t *trace_id,
+//                                     Cause_t            *cause_p);
+
+// int s1ap_eNB_handle_trace_start(eNB_mme_desc_t *eNB_desc_p,
+//                                 sctp_queue_item_t *packet_p,
+//                                 struct s1ap_message_s *message_p);
+int s1ap_eNB_handle_trace_start(uint32_t               assoc_id,
+                                uint32_t               stream,
                                 struct s1ap_message_s *message_p);
 
-int s1ap_eNB_handle_deactivate_trace(eNB_mme_desc_t *eNB_desc_p,
-                                     sctp_queue_item_t *packet_p,
+// int s1ap_eNB_handle_deactivate_trace(eNB_mme_desc_t *eNB_desc_p,
+//                                      sctp_queue_item_t *packet_p,
+//                                      struct s1ap_message_s *message_p);
+int s1ap_eNB_handle_deactivate_trace(uint32_t               assoc_id,
+                                     uint32_t               stream,
                                      struct s1ap_message_s *message_p);
 
 #endif /* S1AP_ENB_TRACE_H_ */

openair-cn/S1AP/s1ap_eNB_ue_context.c

@@ -42,8 +42,10 @@
 
 #include "tree.h"
 
+#include "intertask_interface.h"
+
 #include "s1ap_common.h"
-#include "s1ap_eNB.h"
+#include "s1ap_eNB_defs.h"
 #include "s1ap_eNB_ue_context.h"
 
 inline int s1ap_eNB_compare_eNB_ue_s1ap_id(
@@ -79,7 +81,7 @@ struct s1ap_eNB_ue_context_s *s1ap_eNB_allocate_new_UE_context(void)
 }
 
 struct s1ap_eNB_ue_context_s *s1ap_eNB_get_ue_context(
-    struct eNB_mme_desc_s *eNB_desc_p,
+    s1ap_eNB_instance_t *instance_p,
     uint32_t eNB_ue_s1ap_id)
 {
     s1ap_eNB_ue_context_t temp;
@@ -89,7 +91,7 @@ struct s1ap_eNB_ue_context_s *s1ap_eNB_get_ue_context(
     /* eNB ue s1ap id = 24 bits wide */
     temp.eNB_ue_s1ap_id = eNB_ue_s1ap_id & 0x00FFFFFF;
 
-    return RB_FIND(s1ap_ue_map, &eNB_desc_p->s1ap_ue_head, &temp);
+    return RB_FIND(s1ap_ue_map, &instance_p->s1ap_ue_head, &temp);
 }
 
 void s1ap_eNB_free_ue_context(struct s1ap_eNB_ue_context_s *ue_context_p)

openair-cn/S1AP/s1ap_eNB_ue_context.h

@@ -50,6 +50,9 @@ typedef enum {
 } s1ap_ue_state;
 
 typedef struct s1ap_eNB_ue_context_s {
+    /* Tree related data */
+    RB_ENTRY(s1ap_eNB_ue_context_s) entries;
+
     /* Uniquely identifies the UE between MME and eNB within the eNB.
      * This id is encoded on 24bits.
      */
@@ -69,9 +72,6 @@ typedef struct s1ap_eNB_ue_context_s {
 
     /* Reference to MME data this UE is attached to */
     struct s1ap_eNB_mme_data_s *mme_ref;
-
-    /* Tree related data */
-    RB_ENTRY(s1ap_eNB_ue_context_s) entries;
 } s1ap_eNB_ue_context_t;
 
 inline int s1ap_eNB_compare_eNB_ue_s1ap_id(
@@ -83,8 +83,8 @@ RB_PROTOTYPE(s1ap_ue_map, s1ap_eNB_ue_context_s, entries,
 
 struct s1ap_eNB_ue_context_s *s1ap_eNB_allocate_new_UE_context(void);
 
-struct s1ap_eNB_ue_context_s *s1ap_eNB_get_ue_context(struct eNB_mme_desc_s
-        *eNB_desc_p,
+struct s1ap_eNB_ue_context_s *s1ap_eNB_get_ue_context(
+    s1ap_eNB_instance_t *instance_p,
     uint32_t eNB_ue_s1ap_id);
 
 #endif /* S1AP_ENB_UE_CONTEXT_H_ */

openair-cn/SCTP/Makefile.eNB

-libsctp_OBJECTS = \
-	sctp_primitives_client.o	\
-	sctp_common.o
+include $(OPENAIR_TARGETS)/SIMU/USER/Makerules
 
--include .deps/*.d
+libsctp_OBJECTS = \
+	sctp_common.o	\
+	sctp_eNB_task.o	\
+	sctp_eNB_itti_messaging.o
 
-.PHONY = depdir
+# pull in dependency info for *existing* .o files
+-include .*.d
 
 CFLAGS = \
+	$(S1AP_CFLAGS)		\
 	-I../SCTP		\
-	-I../UTILS		\
-	-I$(OPENAIR2_DIR)	\
-	-I$(OPENAIR2_DIR)/COMMON	\
-	-I$(OPENAIR2_DIR)/S1AP	\
-	-I$(OPENAIR2_DIR)/GTPV1U	\
-	-I$(OPENAIR2_DIR)/GTPV1U/nw-gtpv1u/include	\
-	-I$(OPENAIR2_DIR)/GTPV1U/nw-gtpv1u/shared	\
-	-I$(OPENAIR2_DIR)/UTIL	\
-	-I$(OPENAIR2_DIR)/UTIL/UDP	\
-	-DUPDATE_RELEASE_9	\
 	-DENB_MODE		\
-	-DENABLE_USE_MME	\
-	-DUSER_MODE		\
-	-O2			\
-	-g			\
-	-Wall			\
 	-Werror=implicit-function-declaration
 
 $(libsctp_OBJECTS): %.o : %.c
 	@echo "Compiling $<"
 	@$(CC) -c $(CFLAGS) -o $@ $<
-	@if ! test -d ".deps/" ; then mkdir -p .deps; fi
-	@$(CC) -MM $(CFLAGS) $*.c > .deps/$*.d
-	@mv -f .deps/$*.d .deps/$*.d.tmp
-	@sed -e 's|.*:|$*.o:|' < .deps/$*.d.tmp > .deps/$*.d
-	@sed -e 's/.*://' -e 's/\\$$//' < .deps/$*.d.tmp | fmt -1 | \
-	sed -e 's/^ *//' -e 's/$$/:/' >> .deps/$*.d
-	@rm -f .deps/$*.d.tmp
+	@$(CC) -MM $(CFLAGS) $*.c > $*.d
+	@mv -f $*.d $*.d.tmp
+	@sed -e 's|.*:|$*.o:|' < $*.d.tmp > $*.d
+	@sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | \
+	sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
+	@rm -f $*.d.tmp
 
 libsctp.a: $(libsctp_OBJECTS)
 	@echo Creating SCTP archive
-	@$(AR) rcvs $@ $(libsctp_OBJECTS)
+	@$(AR) rcs $@ $(libsctp_OBJECTS)
 
 clean:
-	rm -f $(libsctp_OBJECTS)
-	rm -rf .deps/
-	rm -f libsctp.a
\ No newline at end of file
+	@$(RM_F_V) $(libsctp_OBJECTS)
+	@$(RM_F_V) *.d
+	@$(RM_F_V) libsctp.a
\ No newline at end of file

openair-cn/SCTP/sctp_common.c

@@ -83,7 +83,7 @@ int sctp_set_init_opt(int sd, uint16_t instreams, uint16_t outstreams,
 }
 
 int sctp_get_sockinfo(int sock, uint16_t *instream, uint16_t *outstream,
-                      uint32_t *assoc_id)
+                      int32_t *assoc_id)
 {
     socklen_t i;
     struct sctp_status status;
@@ -95,7 +95,7 @@ int sctp_get_sockinfo(int sock, uint16_t *instream, uint16_t *outstream,
     memset(&status, 0, sizeof(struct sctp_status));
     i = sizeof(struct sctp_status);
 
-    if(getsockopt(sock, IPPROTO_SCTP, SCTP_STATUS, &status, &i) < 0) {
+    if (getsockopt(sock, IPPROTO_SCTP, SCTP_STATUS, &status, &i) < 0) {
         SCTP_ERROR("Getsockopt SCTP_STATUS failed: %s\n", strerror(errno));
         return -1;
     }

openair-cn/SCTP/sctp_common.h

@@ -47,6 +47,11 @@
 # define SCTP_ERROR(x, args...) LOG_E(SCTP, x, ##args)
 # define SCTP_WARN(x, args...)  LOG_W(SCTP, x, ##args)
 # define SCTP_DEBUG(x, args...) LOG_D(SCTP, x, ##args)
+
+# define SCTP_OUT_STREAMS        (64)
+# define SCTP_IN_STREAMS         (64)
+# define SCTP_MAX_ATTEMPTS       (5)
+# define SCTP_RECV_BUFFER_SIZE   (1024)
 #else
 # define SCTP_ERROR(x, args...) do { fprintf(stderr, "[SCTP][E]"x, ##args); } while(0)
 # define SCTP_DEBUG(x, args...) do { fprintf(stdout, "[SCTP][D]"x, ##args); } while(0)
@@ -57,7 +62,7 @@ int sctp_set_init_opt(int sd, uint16_t instreams, uint16_t outstreams,
                       uint16_t max_attempts, uint16_t init_timeout);
 
 int sctp_get_sockinfo(int sock, uint16_t *instream, uint16_t *outstream,
-                      uint32_t *assoc_id);
+                      int32_t *assoc_id);
 
 int sctp_get_peeraddresses(int sock, struct sockaddr **remote_addr,
                            int *nb_remote_addresses);

openair-cn/SCTP/sctp_eNB_itti_messaging.c

+#include "intertask_interface.h"
+
+#include "sctp_common.h"
+#include "sctp_eNB_itti_messaging.h"
+
+int sctp_itti_send_new_message_ind(task_id_t task_id, uint32_t assoc_id, uint8_t *buffer,
+                                   uint32_t buffer_length, uint16_t stream)
+{
+    MessageDef      *message_p;
+    sctp_data_ind_t *sctp_data_ind_p;
+
+    message_p = itti_alloc_new_message(TASK_SCTP, SCTP_DATA_IND);
+
+    sctp_data_ind_p = &message_p->msg.sctp_data_ind;
+
+    sctp_data_ind_p->buffer = malloc(sizeof(uint8_t) * buffer_length);
+
+    /* Copy the buffer */
+    memcpy((void *)sctp_data_ind_p->buffer, (void *)buffer, buffer_length);
+
+    sctp_data_ind_p->stream        = stream;
+    sctp_data_ind_p->buffer_length = buffer_length;
+    sctp_data_ind_p->assoc_id      = assoc_id;
+
+    return itti_send_msg_to_task(task_id, INSTANCE_DEFAULT, message_p);
+}

openair-cn/SCTP/sctp_eNB_itti_messaging.h

+#ifndef SCTP_ITTI_MESSAGING_H_
+#define SCTP_ITTI_MESSAGING_H_
+
+int sctp_itti_send_new_message_ind(task_id_t task_id, uint32_t assoc_id, uint8_t *buffer,
+                                   uint32_t buffer_length, uint16_t stream);
+
+#endif /* SCTP_ITTI_MESSAGING_H_ */

openair-cn/SCTP/sctp_eNB_task.h

+/*******************************************************************************
+
+  Eurecom OpenAirInterface
+  Copyright(c) 1999 - 2013 Eurecom
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms and conditions of the GNU General Public License,
+  version 2, as published by the Free Software Foundation.
+
+  This program is distributed in the hope it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+
+  The full GNU General Public License is included in this distribution in
+  the file called "COPYING".
+
+  Contact Information
+  Openair Admin: openair_admin@eurecom.fr
+  Openair Tech : openair_tech@eurecom.fr
+  Forums       : http://forums.eurecom.fr/openairinterface
+  Address      : EURECOM, Campus SophiaTech, 450 Route des Chappes
+                 06410 Biot FRANCE
+
+*******************************************************************************/
+
+#ifndef SCTP_ENB_TASK_H_
+#define SCTP_ENB_TASK_H_
+
+void *sctp_eNB_task(void *arg);
+
+#endif /* SCTP_ENB_TASK_H_ */

openair2/COMMON/messages_def.h

@@ -4,3 +4,5 @@
 
 // Messages files used between tasks
 #include "rrc_messages_def.h"
+#include "s1ap_messages_def.h"
+#include "sctp_messages_def.h"
\ No newline at end of file

openair2/COMMON/messages_types.h

@@ -11,5 +11,7 @@
 #include "timer_messages_types.h"
 
 #include "rrc_messages_types.h"
+#include "s1ap_messages_types.h"
+#include "sctp_messages_types.h"
 
 #endif /* MESSAGES_TYPES_H_ */

openair2/COMMON/s1ap_messages_def.h

+MESSAGE_DEF(S1AP_REGISTER_ENB, MESSAGE_PRIORITY_MED, s1ap_register_eNB_t, s1ap_register_eNB)

openair2/COMMON/s1ap_messages_types.h

+#ifndef S1AP_MESSAGES_TYPES_H_
+#define S1AP_MESSAGES_TYPES_H_
+
+enum cell_type_e {
+    CELL_MACRO_ENB,
+    CELL_HOME_ENB
+};
+
+typedef enum {
+    PAGING_DRX_32  = 0x0,
+    PAGING_DRX_64  = 0x1,
+    PAGING_DRX_128 = 0x2,
+    PAGING_DRX_256 = 0x3,
+} paging_drx_t;
+
+typedef struct {
+    unsigned ipv4:1;
+    unsigned ipv6:1;
+    char ipv4_address[16];
+    char ipv6_address[40];
+} net_ip_address_t;
+
+#define S1AP_MAX_NB_MME_IP_ADDRESS 10
+
+typedef struct {
+    /* For virtual mode, mod_id as defined in the rest of the L1/L2 stack */
+    uint8_t mod_id;
+
+    /* Unique eNB_id to identify the eNB within EPC.
+     * For macro eNB ids this field should be 20 bits long.
+     * For home eNB ids this field should be 28 bits long.
+     */
+    uint32_t eNB_id;
+    /* The type of the cell */
+    enum cell_type_e cell_type;
+
+    /* Optional name for the cell
+     * NOTE: the name can be NULL (i.e no name) and will be cropped to 150
+     * characters.
+     */
+    char *eNB_name;
+
+    /* Tracking area code */
+    uint16_t tac;
+
+    /* Mobile Country Code
+     * Mobile Network Code
+     */
+    uint16_t mcc;
+    uint16_t mnc;
+
+    /* Default Paging DRX of the eNB as defined in TS 36.304 */
+    paging_drx_t default_drx;
+
+    /* The eNB IP address to bind */
+    net_ip_address_t enb_ip_address;
+
+    /* Nb of MME to connect to */
+    uint8_t          nb_mme;
+    /* List of MME to connect to */
+    net_ip_address_t mme_ip_address[S1AP_MAX_NB_MME_IP_ADDRESS];
+} s1ap_register_eNB_t;
+
+#endif /* S1AP_MESSAGES_TYPES_H_ */

openair2/COMMON/sctp_messages_def.h

+MESSAGE_DEF(SCTP_NEW_ASSOCIATION_REQ , MESSAGE_PRIORITY_MED, sctp_new_association_req_t          , sctp_new_association_req)
+MESSAGE_DEF(SCTP_NEW_ASSOCIATION_RESP, MESSAGE_PRIORITY_MED, sctp_new_association_resp_t         , sctp_new_association_resp)
+MESSAGE_DEF(SCTP_REGISTER_UPPER_LAYER, MESSAGE_PRIORITY_MED, sctp_listener_register_upper_layer_t, sctp_listener_register_upper_layer)
+MESSAGE_DEF(SCTP_DATA_REQ,             MESSAGE_PRIORITY_MED, sctp_data_req_t                     , sctp_data_req)
+MESSAGE_DEF(SCTP_DATA_IND,             MESSAGE_PRIORITY_MED, sctp_data_ind_t                     , sctp_data_ind)
\ No newline at end of file

openair2/COMMON/sctp_messages_types.h

+#ifndef SCTP_MESSAGES_TYPES_H_
+#define SCTP_MESSAGES_TYPES_H_
+
+enum sctp_state_e {
+    SCTP_STATE_CLOSED,
+    SCTP_STATE_SHUTDOWN_PENDING,
+    SCTP_STATE_ESTABLISHED
+};
+
+typedef struct {
+    /* Module id: used in virtual mode */
+    uint8_t          mod_id;
+    /* Upper layer connexion identifier */
+    uint16_t         ulp_cnx_id;
+
+    /* The port to connect to */
+    uint16_t         port;
+    /* Payload Protocol Identifier to use */
+    uint32_t         ppid;
+
+    /* Local address to bind to */
+    net_ip_address_t local_address;
+    /* Remote address to connect to */
+    net_ip_address_t remote_address;
+} sctp_new_association_req_t;
+
+typedef struct {
+    /* Module id: used in virtual mode */
+    uint8_t  mod_id;
+    /* Upper layer connexion identifier */
+    uint16_t ulp_cnx_id;
+
+    /* SCTP Association ID */
+    int32_t  assoc_id;
+
+    /* Input/output streams */
+    uint16_t out_streams;
+    uint16_t in_streams;
+
+    /* State of the association at SCTP level */
+    enum sctp_state_e sctp_state;
+} sctp_new_association_resp_t;
+
+typedef struct {
+    int32_t   assoc_id;
+    uint32_t  buffer_length;
+    uint8_t  *buffer;
+
+    /* Streams on which data will be sent/received */
+    uint16_t  stream;
+} sctp_data_ind_t;
+
+typedef sctp_data_ind_t sctp_data_req_t;
+
+typedef struct {
+    /* Port to listen to */
+    uint16_t port;
+    /* Payload protocol identifier
+     * Any data receveid on PPID != will be discarded
+     */
+    uint32_t ppid;
+} sctp_listener_register_upper_layer_t;
+
+#endif /* SCTP_MESSAGES_TYPES_H_ */

openair2/COMMON/tasks_def.h

@@ -31,3 +31,6 @@ TASK_DEF(TASK_NAS_UE, TASK_PRIORITY_MED)
 
 /// S1ap task for eNodeB
 TASK_DEF(TASK_S1AP, TASK_PRIORITY_MED)
+
+/// Sctp task for eNodeB (Used by both S1AP and X2AP)
+TASK_DEF(TASK_SCTP, TASK_PRIORITY_MED)

openair2/RRC/LITE/rrc_eNB.c

@@ -476,11 +476,13 @@ openair_rrc_lite_eNB_init (u8 Mod_id)
   /* Connect eNB to MME */
   if (oai_emulation.info.mme_enabled > 0)
     {
+# if !defined(ENABLE_ITTI)
       if (s1ap_eNB_init (oai_emulation.info.mme_ip_address, Mod_id) < 0)
         {
           mac_xface->macphy_exit ("");
           return -1;
         }
+# endif
     }
 #endif
 
@@ -796,7 +798,7 @@ rrc_eNB_decode_dcch (u8 Mod_id, u32 frame, u8 Srb_id, u8 UE_index,
         case UL_DCCH_MessageType__c1_PR_ulHandoverPreparationTransfer:
           break;
         case UL_DCCH_MessageType__c1_PR_ulInformationTransfer:
-#if defined(ENABLE_USE_MME)
+#if defined(ENABLE_USE_MME) && !defined(ENABLE_ITTI)
           {
             if (oai_emulation.info.mme_enabled == 1)
               {
@@ -1053,7 +1055,7 @@ rrc_eNB_process_RRCConnectionSetupComplete (u8 Mod_id,
          Mod_id, frame, UE_index);
 
   // Forward message to S1AP layer
-#if defined(ENABLE_USE_MME)
+#if defined(ENABLE_USE_MME) && !defined(ENABLE_ITTI)
   if (oai_emulation.info.mme_enabled == 1)
     s1ap_eNB_new_data_request (Mod_id, UE_index,
                                rrcConnectionSetupComplete->dedicatedInfoNAS.

openair2/UTIL/Makefile.inc

@@ -10,7 +10,6 @@ OMG_DIR=$(OPENAIR2_TOP)/UTIL/OMG
 OTG_DIR=$(OPENAIR2_TOP)/UTIL/OTG
 CLI_DIR=$(OPENAIR2_TOP)/UTIL/CLI
 OMV_DIR=$(OPENAIR2_TOP)/UTIL/OMV
-SCTP_DIR=$(OPENAIR2_TOP)/UTIL/SCTP
 LFDS_DIR=$(OPENAIR2_TOP)/UTIL/LFDS/liblfds6.1.1/liblfds611
 OSA_DIR=$(OPENAIR2_TOP)/UTIL/OSA
 
@@ -71,12 +70,19 @@ CLI_OBJ  =  $(CLI_DIR)/cli_server.o
 CLI_OBJ  +=  $(CLI_DIR)/cli.o
 CLI_OBJ  +=  $(CLI_DIR)/cli_cmd.o
 
-ifdef $(USE_MME)
-SCTP_OBJS = $(SCTP_DIR)/sctp_primitives_client.o
-else
-SCTP_OBJS = 
-endif
-UTIL_OBJ = $(OSA_OBJS) $(FIFO_OBJ) $(LIST_OBJ) $(TIMER_OBJ) $(MEM_OBJ) $(LOG_OBJS) $(OCG_OBJS) $(MATH_OBJS) $(OTG_OBJS) $(CLI_OBJ) $(OMG_OBJS) $(OPT_OBJS) $(SCTP_OBJS)
+UTIL_OBJ =              \
+    $(OSA_OBJS)         \
+    $(FIFO_OBJ)         \
+    $(LIST_OBJ)         \
+    $(TIMER_OBJ)        \
+    $(MEM_OBJ)          \
+    $(LOG_OBJS)         \
+    $(OCG_OBJS)         \
+    $(MATH_OBJS)        \
+    $(OTG_OBJS)         \
+    $(CLI_OBJ)          \
+    $(OMG_OBJS)         \
+    $(OPT_OBJS)
 
 UTIL_incl = \
     -I$(OPENAIR2_TOP)/UTIL      \
@@ -93,5 +99,4 @@ UTIL_incl = \
     -I$(OTG_DIR)                \
     -I$(CLI_DIR)                \
     -I$(OPT_DIR)                \
-    -I$(OMV_DIR)                \
-    -I$(SCTP_DIR)
+    -I$(OMV_DIR)

targets/SIMU/USER/Makefile

-CC = gcc
-MPICC = gcc #mpicc
-RM_F_V = rm -f -v
+# Include some standard directives
+include Makerules
 
 CPUFLAGS = -mmmx -msse -msse2 -msse4.1 -march=native
 # FORCE ssse3 for compilation of openair on User Mode Linux
@@ -8,8 +7,6 @@ CPUFLAGS += $(shell if grep --silent ssse3 /proc/cpuinfo ; then echo "-mssse3" ;
 CPUFLAGS += $(shell if grep --silent sse4 /proc/cpuinfo ; then echo "-msse4" ; else echo ""; fi)
 linux = $(shell if [ `uname` = "Linux" ] ; then echo "1" ; else echo "0" ; fi)
 
-NUM_CORES=$(shell cat /proc/cpuinfo | grep processor | wc -l)
-
 COMMON_UTILS_DIR    = $(OPENAIR_HOME)/common/utils
 TOP_DIR             = $(OPENAIR1_DIR)
 OPENAIR1_TOP        = $(OPENAIR1_DIR)
@@ -17,6 +14,12 @@ OPENAIR2_TOP        = $(OPENAIR2_DIR)
 OPENAIR3_TOP        = $(OPENAIR3_DIR)
 OPENAIR3            = $(OPENAIR3_DIR)
 
+S1AP_DIR            = $(OPENAIR_HOME)/openair-cn/S1AP
+SCTP_DIR            = $(OPENAIR_HOME)/openair-cn/SCTP
+
+export S1AP_DIR
+export COMMON_UTILS_DIR
+
 CFLAGS = -Wall -fno-strict-aliasing -DUSER_MODE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -g -ggdb $(CPUFLAGS) -I/usr/include/X11 #-Wno-packed-bitfield-compat
 
 ifdef ENABLE_ITTI
@@ -172,9 +175,6 @@ UPDATE_RELEASE_9=1
 endif
 
 ifdef SECU
-NETTLE_FOUND = $(shell if pkg-config --exists nettle; then echo "1" ; else echo "0"; fi)
-OPENSSL_FOUND = $(shell if pkg-config --exists openssl; then echo "1" ; else echo "0"; fi)
-
 ifeq ($(NETTLE_FOUND), 0)
 @echo "Nettle library >= 2.5 is not installed on your system, continuing with security disabled"
 SECU=0
@@ -204,15 +204,6 @@ include $(OPENAIR2_DIR)/S1AP/MESSAGES/Makefile.inc
 #LOG_OBJS +=  $(LOG_DIR)/vcd_signal_dumper.o
 #LOG_OBJS +=  $(LOG_DIR)/log.o
 
-CFLAGS += -DENB_MODE
-S1AP_BUILT_OBJS=
-
-ifdef USE_MME
-CFLAGS += -DENABLE_USE_MME
-CFLAGS_S1AP += -DENB_MODE -DENABLE_USE_MME -DEMIT_ASN_DEBUG=1 -DUSER_MODE
-S1AP_BUILT_OBJS += $(S1AP_OBJS) $(addprefix $(OPENAIR2_DIR)/S1AP/MESSAGES/, $(S1AP_ASN_MODULE_SOURCES))
-endif
-
 ITTI_MESSAGES_H = messages_xml.h
 
 ITTI_MESSAGES_XML = messages.xml
@@ -274,8 +265,7 @@ endif
 
 # Check if libpgm is installed and use it if found instead of the unreliable
 # multicast
-ENABLE_PGM = $(shell if pkg-config --exists openpgm-5.1; then echo "1" ; else echo "0"; fi)
-ifeq ($(ENABLE_PGM), 1)
+ifeq ($(PGM_FOUND), 1)
 CFLAGS += `pkg-config --cflags openpgm-5.1` -DENABLE_PGM_TRANSPORT
 PGM_LDFLAGS = `pkg-config --libs openpgm-5.1`
 endif
@@ -285,9 +275,19 @@ ifeq ($(OPENAIR2),1)
 OBJ += $(L2_OBJS)
 endif
 
-LIB =  $(LFDS_DIR)/bin/liblfds611.a
+LIBS = $(LFDS_DIR)/bin/liblfds611.a
+
 ifdef USE_MME
-LIB += $(S1AP_DIR)/libs1ap.a
+CFLAGS += -DENB_MODE -DENABLE_USE_MME -DENABLE_EVENT_FD -I$(S1AP_DIR) -I$(SCTP_DIR)
+
+S1AP_CFLAGS = $(CFLAGS) -I$(TOP_DIR) $(L2_incl) $(UTIL_incl) $(UTILS_incl)
+LIBS += $(S1AP_DIR)/libs1ap.a $(SCTP_DIR)/libsctp.a -lsctp
+export S1AP_CFLAGS
+
+$(S1AP_DIR)/libs1ap.a: force_look
+	$(MAKE) -C $(S1AP_DIR) -f Makefile.eNB libs1ap.a
+$(SCTP_DIR)/libsctp.a: force_look
+	$(MAKE) -C $(SCTP_DIR) -f Makefile.eNB libsctp.a
 endif
 
 default: oaisim
@@ -313,16 +313,6 @@ printvars:
 	@echo CFLAGS: $(CFLAGS)
 	@echo Enable PGM: $(ENABLE_PGM)
 
-ASN1RELDIR=R9.8
-ifeq ($(USE_MME), R8)
-	ASN1RELDIR=R8.10
-else
-	CFLAGS_S1AP += -DUPDATE_RELEASE_9
-endif
-S1AP_DIR=$(OPENAIR2_DIR)/S1AP
-ASN1MESSAGESDIR=$(S1AP_DIR)/MESSAGES
-ASN1DIR=$(ASN1MESSAGESDIR)/ASN1
-
 -include $(ITTI_MESSAGES_XML:.xml=.d)
 -include $(OBJ:.o=.d)
 -include $(OAISIM_OBJS:.o=.d)
@@ -366,22 +356,6 @@ $(OBJ) $(OAISIM_OBJS) $(OAISIM_PAD_OBJS) $(ASN1_MSG_OBJS1): %.o : %.c
 	sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
 	@rm -f $*.d.tmp
 
-$(S1AP_BUILT_OBJS): %.o : %.c
-	@echo Compiling $<
-	@$(CC) -Wall -c $(CFLAGS_S1AP) $(S1AP_Incl) $(UTIL_incl) $(UTILS_incl) -o $@ $<
-
-$(ASN1MESSAGESDIR)/s1ap_ieregen.stamp: $(ASN1DIR)/$(ASN1RELDIR)/S1AP-PDU-Contents.asn $(ASN1DIR)/asn1tostruct.py
-	echo Timestamp > $@
-	(cd $(ASN1DIR) && python $(ASN1DIR)/asn1tostruct.py -f$<)
-
-$(ASN1MESSAGESDIR)/s1ap_asn1regen.stamp: $(ASN1DIR)/$(ASN1RELDIR)/S1AP-CommonDataTypes.asn $(ASN1DIR)/$(ASN1RELDIR)/S1AP-Constants.asn $(ASN1DIR)/$(ASN1RELDIR)/S1AP-IEs.asn $(ASN1DIR)/$(ASN1RELDIR)/S1AP-PDU.asn
-	echo Timestamp > $@
-	(cd $(ASN1MESSAGESDIR) && asn1c -gen-PER -fnative-types -fskeletons-copy $^)
-
-$(S1AP_DIR)/libs1ap.a: $(ASN1MESSAGESDIR)/s1ap_ieregen.stamp $(ASN1MESSAGESDIR)/s1ap_asn1regen.stamp $(S1AP_BUILT_OBJS)
-	@echo Creating $@
-	$(AR) rcs $@ $^
-
 $(LFDS_DIR)/bin/liblfds611.a:
 	$(MAKE) -C $(LFDS_DIR) -f makefile.linux
 
@@ -390,11 +364,11 @@ oaisim_pad: $(OBJ) $(OAISIM_PAD_OBJS) $(ASN1_MSG_OBJS1)
 	@$(MPICC) -I$(TOP_DIR) $(L2_incl) $(UTIL_incl) $(UTILS_incl) -I$(ASN1_MSG_INC) $(S1AP_Incl) -o oaisim_pad $(CFLAGS) $(EXTRA_CFLAGS) $(OBJ) $(OAISIM_PAD_OBJS) $(ASN1_MSG_OBJS1) \
 	 -lm -lblas -lpthread -llapack_atlas -lforms -lxml2 -lX11 -lXpm -lrt
 
-oaisim: $(OBJ) $(OAISIM_OBJS) $(ASN1_MSG_OBJS1) $(LIB)
+oaisim: $(OBJ) $(OAISIM_OBJS) $(ASN1_MSG_OBJS1) $(LIBS)
 	@echo "Linking oaisim ..."
 	@$(CC) -I$(TOP_DIR) $(L2_incl) $(UTIL_incl) $(UTILS_incl) -I$(ASN1_MSG_INC) $(S1AP_Incl) -o oaisim $(CFLAGS) $(EXTRA_CFLAGS) $(OBJ) $(OAISIM_OBJS) $(ASN1_MSG_OBJS1) \
 	-lm -lblas -lpthread -llapack_atlas -lforms -lxml2 -lX11 -lXpm -lrt \
-	$(LIB) $(PGM_LDFLAGS) $(DB_LDFLAGS) $(OSA_LDFLAGS)
+	$(LIBS) $(PGM_LDFLAGS) $(DB_LDFLAGS) $(OSA_LDFLAGS)
 
 ifeq ($(rrc_cellular_eNB),1)
 	mv oaisim oaisim_eNB
@@ -438,7 +412,7 @@ rrm_std_cellular:
 	( cd $(OPENAIR2_DIR)/NAS/SIMU_CELLULAR && make cell_rrm CELL_RRM=1 CELLULAR=1 NO_RRM=1)
 
 
-cleanall: clean cleanasn1 cleanmmeasn1
+cleanall: clean cleanasn1
 
 clean:
 	@$(MAKE) -C $(LFDS_DIR) -f makefile.linux clean
@@ -449,10 +423,10 @@ clean:
 	@$(RM_F_V) $(OAISIM_OBJS) $(OAISIM_OBJS:.o=.d)
 	@$(RM_F_V) $(OAISIM_PAD_OBJS) $(OAISIM_PAD_OBJS:.o=.d)
 	@$(RM_F_V) $(ASN1_MSG_OBJS1) $(ASN1_MSG_OBJS1:.o=.d)
-	@$(RM_F_V) $(S1AP_BUILT_OBJS)
-	@$(RM_F_V) $(ASN1MESSAGESDIR)/libs1ap.a
 	@$(RM_F_V) *.exe*
 	@$(RM_F_V) $(ASN1_MSG_INC)/asn1_msg.o
+	@$(MAKE) -C $(S1AP_DIR) -f Makefile.eNB clean
+	@$(MAKE) -C $(SCTP_DIR) -f Makefile.eNB clean
 
 cleanl1:
 	@$(RM_F_V) LOG_THREAD oaisim
@@ -471,13 +445,7 @@ cleanasn1:
 	@$(RM_F_V) $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/Makefile.inc.generated
 	@$(RM_F_V) $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel10
 	@$(RM_F_V) $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel8
-
-cleanmmeasn1:
-	@$(RM_F_V) $(S1AP_BUILT_OBJS)
-	@$(RM_F_V) $(S1AP_BUILT_OBJS:.o:.c)
-	@$(RM_F_V) $(ASN1MESSAGESDIR)/libs1ap.a
-	@$(RM_F_V) $(ASN1MESSAGESDIR)/s1ap_asn1regen.stamp
-	@$(RM_F_V) $(ASN1MESSAGESDIR)/s1ap_ieregen.stamp
+	@$(MAKE) -C $(S1AP_DIR) -f Makefile.eNB cleanall
 
 cleancell:
 	@$(RM_F_V) $(OPENAIR2_DIR)/RRC/CELLULAR/*.o
@@ -505,7 +473,11 @@ print:
 	@echo "ENABLE_DB is "    	$(ENABLE_DB)
 
 showcflags:
-	@echo $(CFLAGS)
+	@echo oaisim cflags: $(CFLAGS)
+	@$(MAKE) -C $(S1AP_DIR) -f Makefile.eNB showcflags
+
+force_look:
+	true
 
 otg_all: otg_latency otg_gp
 

targets/SIMU/USER/Makerules

+CC = gcc
+MPICC = gcc #mpicc
+RM_F_V = rm -f -v
+
+NUM_CORES=$(shell cat /proc/cpuinfo | grep processor | wc -l)
+
+NETTLE_FOUND    = $(shell if pkg-config --exists nettle; then echo "1" ; else echo "0"; fi)
+OPENSSL_FOUND   = $(shell if pkg-config --exists openssl; then echo "1" ; else echo "0"; fi)
+PGM_FOUND       = $(shell if pkg-config --exists openpgm-5.1; then echo "1" ; else echo "0"; fi)

targets/SIMU/USER/oaisim.c

@@ -73,6 +73,10 @@ char smbv_ip[16];
 #if defined(ENABLE_ITTI)
 # include "intertask_interface_init.h"
 # include "timer.h"
+# if defined(ENABLE_USE_MME)
+#   include "s1ap_eNB.h"
+#   include "sctp_eNB_task.h"
+# endif
 #endif
 
 #define RF
@@ -381,6 +385,40 @@ void *l2l1_task(void *args_p) {
   MessageDef *message_p;
 
   itti_mark_task_ready (TASK_L2L1);
+# if defined(ENABLE_USE_MME)
+    /* Trying to register each eNB */
+    for (eNB_id = oai_emulation.info.first_enb_local;
+         (eNB_id < (oai_emulation.info.first_enb_local + oai_emulation.info.nb_enb_local)) && (oai_emulation.info.cli_start_enb[eNB_id] == 1);
+         eNB_id++)
+    {
+        /* FIXME: acquire MMEs IP address by XML file or command line */
+        char *mme_address_v4 = "192.168.12.87";
+        char *mme_address_v6 = "2001:660:5502:12:30da:829a:2343:b6cf";
+        s1ap_register_eNB_t *s1ap_register_eNB;
+        message_p = itti_alloc_new_message(TASK_L2L1, S1AP_REGISTER_ENB);
+
+        s1ap_register_eNB = &message_p->msg.s1ap_register_eNB;
+
+        /* Some default/random parameters */
+        s1ap_register_eNB->mod_id      = eNB_id;
+        /* FIXME: generate unique eNB id */
+        s1ap_register_eNB->eNB_id      = 1 + eNB_id;
+        s1ap_register_eNB->cell_type   = CELL_MACRO_ENB;
+        s1ap_register_eNB->tac         = 8;
+        s1ap_register_eNB->mcc         = 208;
+        s1ap_register_eNB->mnc         = 35;
+        s1ap_register_eNB->default_drx = PAGING_DRX_256;
+        s1ap_register_eNB->nb_mme      = 1;
+        s1ap_register_eNB->mme_ip_address[0].ipv4 = 1;
+        s1ap_register_eNB->mme_ip_address[0].ipv6 = 0;
+        memcpy(s1ap_register_eNB->mme_ip_address[0].ipv4_address, mme_address_v4,
+               strlen(mme_address_v4));
+        memcpy(s1ap_register_eNB->mme_ip_address[0].ipv6_address, mme_address_v6,
+               strlen(mme_address_v6));
+
+        itti_send_msg_to_task(TASK_S1AP, INSTANCE_DEFAULT, message_p);
+    }
+# endif
 #endif
 
   for (frame = 0; frame < oai_emulation.info.n_frames; frame++) {
@@ -987,6 +1025,19 @@ int main(int argc, char **argv) {
   LOG_N(EMU, "\n\n>>>>>>>>>>>>>>>>>>>>>>>>>>> OAIEMU initialization done <<<<<<<<<<<<<<<<<<<<<<<<<<\n\n");
 
 #if defined(ENABLE_ITTI)
+# if defined(ENABLE_USE_MME)
+  if (itti_create_task(TASK_SCTP, sctp_eNB_task, NULL) < 0) {
+      LOG_E(EMU, "Create task failed");
+      LOG_D(EMU, "Initializing SCTP task interface: FAILED\n");
+      return -1;
+  }
+  if (itti_create_task(TASK_S1AP, s1ap_eNB_task, NULL) < 0) {
+      LOG_E(EMU, "Create task failed");
+      LOG_D(EMU, "Initializing S1AP task interface: FAILED\n");
+      return -1;
+  }
+# endif
+
   if (itti_create_task(TASK_L2L1, l2l1_task, NULL) < 0) {
     LOG_E(EMU, "Create task failed");
     LOG_D(EMU, "Initializing L2L1 task interface: FAILED\n");