Moved context mangement functions to s1ap_ctx_mngmnt_proc class.

srsepc/hdr/mme/s1ap.h

@@ -71,9 +71,9 @@ public:
   bool handle_initiating_message(LIBLTE_S1AP_INITIATINGMESSAGE_STRUCT *msg, struct sctp_sndrcvinfo *enb_sri);
   bool handle_successful_outcome(LIBLTE_S1AP_SUCCESSFULOUTCOME_STRUCT *msg);
 
-  bool handle_ue_context_release_request(LIBLTE_S1AP_MESSAGE_UECONTEXTRELEASEREQUEST_STRUCT *ue_rel, struct sctp_sndrcvinfo *enb_sri);
+  //bool handle_ue_context_release_request(LIBLTE_S1AP_MESSAGE_UECONTEXTRELEASEREQUEST_STRUCT *ue_rel, struct sctp_sndrcvinfo *enb_sri);
-  bool send_initial_context_setup_request(uint32_t mme_ue_s1ap_id, struct srslte::gtpc_create_session_response *cs_resp, struct srslte::gtpc_f_teid_ie sgw_ctrl_fteid);
+  //bool send_initial_context_setup_request(uint32_t mme_ue_s1ap_id, struct srslte::gtpc_create_session_response *cs_resp, struct srslte::gtpc_f_teid_ie sgw_ctrl_fteid);
-  bool handle_initial_context_setup_response(LIBLTE_S1AP_MESSAGE_INITIALCONTEXTSETUPRESPONSE_STRUCT *in_ctxt_resp);
+  //bool handle_initial_context_setup_response(LIBLTE_S1AP_MESSAGE_INITIALCONTEXTSETUPRESPONSE_STRUCT *in_ctxt_resp);
 
   void activate_eps_bearer(uint32_t mme_s1ap_id, uint8_t ebi);
 
@@ -90,6 +90,10 @@ public:
   s1ap_args_t                    m_s1ap_args;
   srslte::log_filter            *m_s1ap_log;
 
+  s1ap_mngmt_proc*               m_s1ap_mngmt_proc;
+  s1ap_nas_transport*             m_s1ap_nas_transport;
+  s1ap_ctx_mngmt_proc*             m_s1ap_ctx_mngmt_proc;
+
 private:
   s1ap();
   virtual ~s1ap();
@@ -107,10 +111,7 @@ private:
   std::map<uint16_t,std::set<uint32_t> >            m_enb_id_to_ue_ids;
   uint32_t                                          m_next_mme_ue_s1ap_id;
 
-  s1ap_mngmt_proc*               m_s1ap_mngmt_proc;
+  
-  s1ap_nas_transport*             m_s1ap_nas_transport;
-  s1ap_ctx_mngmt_proc*             m_s1ap_ctx_mngmt_proc;
-
   //FIXME the GTP-C should be moved to the MME class, the the packaging of GTP-C messages is done.
   mme_gtpc *m_mme_gtpc;
 };

srsepc/hdr/mme/s1ap_ctx_mngmt_proc.h

@@ -48,7 +48,7 @@ public:
   void init(void);
 
   bool send_initial_context_setup_request(uint32_t mme_ue_s1ap_id, struct srslte::gtpc_create_session_response *cs_resp, struct srslte::gtpc_f_teid_ie sgw_ctrl_fteid);
-  bool handle_initial_context_setup_response(LIBLTE_S1AP_MESSAGE_INITIALCONTEXTSETUPRESPONSE_STRUCT *in_ctxt_resp, struct sctp_sndrcvinfo *enb_sri, srslte::byte_buffer_t *reply_buffer, bool *reply_flag);
+  bool handle_initial_context_setup_response(LIBLTE_S1AP_MESSAGE_INITIALCONTEXTSETUPRESPONSE_STRUCT *in_ctxt_resp);
   bool handle_ue_context_release_request(LIBLTE_S1AP_MESSAGE_UECONTEXTRELEASEREQUEST_STRUCT *ue_rel, struct sctp_sndrcvinfo *enb_sri, srslte::byte_buffer_t *reply_buffer, bool *reply_flag);
 
 private:

srsepc/src/mme/mme_gtpc.cc

@@ -160,7 +160,7 @@ mme_gtpc::handle_create_session_response(srslte::gtpc_pdu *cs_resp_pdu)
   sgw_ctrl_fteid.teid = cs_resp_pdu->header.teid;
   sgw_ctrl_fteid.ipv4 = 0; //FIXME This is not used for now. In the future it will be obtained from the socket addr_info
 
-  m_s1ap->send_initial_context_setup_request(mme_s1ap_id, cs_resp, sgw_ctrl_fteid);
+  m_s1ap->m_s1ap_ctx_mngmt_proc->send_initial_context_setup_request(mme_s1ap_id, cs_resp, sgw_ctrl_fteid);
 }
 
 

srsepc/src/mme/s1ap.cc

@@ -274,7 +274,8 @@ s1ap::handle_initiating_message(LIBLTE_S1AP_INITIATINGMESSAGE_STRUCT *msg,  stru
     break;
   case LIBLTE_S1AP_INITIATINGMESSAGE_CHOICE_UECONTEXTRELEASEREQUEST:
     m_s1ap_log->info("Received UE Context Release Request Message.\n");
-    return handle_ue_context_release_request(&msg->choice.UEContextReleaseRequest, enb_sri);
+    m_s1ap_ctx_mngmt_proc->handle_ue_context_release_request(&msg->choice.UEContextReleaseRequest, enb_sri, reply_buffer, &reply_flag);
+    break;
   default:
     m_s1ap_log->error("Unhandled intiating message: %s\n", liblte_s1ap_initiatingmessage_choice_text[msg->choice_type]);
   }
@@ -299,14 +300,14 @@ s1ap::handle_successful_outcome(LIBLTE_S1AP_SUCCESSFULOUTCOME_STRUCT *msg)
   switch(msg->choice_type) {
   case LIBLTE_S1AP_SUCCESSFULOUTCOME_CHOICE_INITIALCONTEXTSETUPRESPONSE:
     m_s1ap_log->info("Received Initial Context Setup Response.\n");
-    return handle_initial_context_setup_response(&msg->choice.InitialContextSetupResponse);
+    return m_s1ap_ctx_mngmt_proc->handle_initial_context_setup_response(&msg->choice.InitialContextSetupResponse);
   default:
     m_s1ap_log->error("Unhandled successful outcome message: %s\n", liblte_s1ap_successfuloutcome_choice_text[msg->choice_type]);
   }
   return true;
 }
 
-
+  /*
 bool
 s1ap::send_initial_context_setup_request(uint32_t mme_ue_s1ap_id, struct srslte::gtpc_create_session_response *cs_resp, struct srslte::gtpc_f_teid_ie sgw_ctrl_fteid)
 {
@@ -542,7 +543,7 @@ s1ap::handle_ue_context_release_request(LIBLTE_S1AP_MESSAGE_UECONTEXTRELEASEREQU
   m_s1ap_log->info("Deleted UE Context.\n");
   return true;
 }
-
+  */
 bool
 s1ap::delete_ue_ctx(ue_ctx_t *ue_ctx)
 {

srsepc/src/mme/s1ap_ctx_mngmt_proc.cc

@@ -212,7 +212,7 @@ s1ap_ctx_mngmt_proc::send_initial_context_setup_request(uint32_t mme_ue_s1ap_id,
 }
 
 bool
-s1ap_ctx_mngmt_proc::handle_initial_context_setup_response(LIBLTE_S1AP_MESSAGE_INITIALCONTEXTSETUPRESPONSE_STRUCT *in_ctxt_resp, struct sctp_sndrcvinfo *enb_sri, srslte::byte_buffer_t *reply_buffer, bool *reply_flag)
+s1ap_ctx_mngmt_proc::handle_initial_context_setup_response(LIBLTE_S1AP_MESSAGE_INITIALCONTEXTSETUPRESPONSE_STRUCT *in_ctxt_resp)
 {
 
   uint32_t mme_ue_s1ap_id = in_ctxt_resp->MME_UE_S1AP_ID.MME_UE_S1AP_ID;