Added code to handle delete session procedure and added routing logic to send s11 messages to either spgw task or sgw_s8 task based on federated mode of configuration

rsarwad · rsarwad · commit 7b987e767b89 · 2021-04-01T08:12:52.000+05:30
Signed-off-by: rashmi &lt;rashmi.sarwad@radisys.com&gt;
diff --git a/lte/gateway/c/oai/include/s8_messages_def.h b/lte/gateway/c/oai/include/s8_messages_def.h
@@ -15,3 +15,5 @@ limitations under the License.
 // instead.
 MESSAGE_DEF(
     S8_CREATE_SESSION_RSP, s8_create_session_response_t, s8_create_session_rsp)
+MESSAGE_DEF(
+    S8_DELETE_SESSION_RSP, s8_delete_session_response_t, s8_delete_session_rsp)
diff --git a/lte/gateway/c/oai/include/s8_messages_types.h b/lte/gateway/c/oai/include/s8_messages_types.h
@@ -17,6 +17,7 @@ limitations under the License.
 #include "common_types.h"
 
 #define S8_CREATE_SESSION_RSP(mSGpTR) (mSGpTR)->ittiMsg.s8_create_session_rsp
+#define S8_DELETE_SESSION_RSP(mSGpTR) (mSGpTR)->ittiMsg.s8_delete_session_rsp
 
 typedef struct s8_bearer_context_s {
   ebi_t eps_bearer_id;
@@ -33,8 +34,12 @@ typedef struct s8_create_session_response_s {
   teid_t context_teid;  // SGW_S11_teid, created per PDN
   ebi_t eps_bearer_id;
   s8_bearer_context_t bearer_context[BEARERS_PER_UE];
-  uint8_t response_cause;
   uint8_t apn_restriction_value;
   fteid_t pgw_s8_cp_teid;
   uint32_t cause;
 } s8_create_session_response_t;
+
+typedef struct s8_delete_session_response_s {
+  teid_t context_teid;  // SGW_S11_teid, created per PDN
+  uint32_t cause;
+} s8_delete_session_response_t;
diff --git a/lte/gateway/c/oai/lib/s8_proxy/s8_client_api.cpp b/lte/gateway/c/oai/lib/s8_proxy/s8_client_api.cpp
@@ -102,10 +102,54 @@ static void get_paa_from_proto_msg(
   }
   OAILOG_FUNC_OUT(LOG_SGW_S8);
 }
+
 static void recv_s8_delete_session_response(
     imsi64_t imsi64, teid_t context_teid, const grpc::Status& status,
     magma::feg::DeleteSessionResponsePgw& response) {
   OAILOG_FUNC_IN(LOG_SGW_S8);
+
+  s8_delete_session_response_t* s8_delete_session_rsp = NULL;
+  MessageDef* message_p                               = NULL;
+  message_p = itti_alloc_new_message(TASK_GRPC_SERVICE, S8_DELETE_SESSION_RSP);
+  if (!message_p) {
+    OAILOG_ERROR_UE(
+        LOG_SGW_S8, imsi64,
+        "Failed to allocate memory for S8_DELETE_SESSION_RSP for "
+        "context_teid" TEID_FMT "\n",
+        context_teid);
+    OAILOG_FUNC_OUT(LOG_SGW_S8);
+  }
+  s8_delete_session_rsp         = &message_p->ittiMsg.s8_delete_session_rsp;
+  message_p->ittiMsgHeader.imsi = imsi64;
+  s8_delete_session_rsp->context_teid = context_teid;
+
+  if (status.ok()) {
+    if (response.has_gtp_error()) {
+      s8_delete_session_rsp->cause = response.mutable_gtp_error()->cause();
+    } else {
+      s8_delete_session_rsp->cause = REQUEST_ACCEPTED;
+    }
+  } else {
+    OAILOG_ERROR_UE(
+        LOG_SGW_S8, imsi64,
+        "Received gRPC error for delete session response for "
+        "context_teid " TEID_FMT "\n",
+        context_teid);
+    s8_delete_session_rsp->cause = REMOTE_PEER_NOT_RESPONDING;
+  }
+  OAILOG_INFO_UE(
+      LOG_UTIL, imsi64,
+      "Sending delete session response to sgw_s8 task for "
+      "context_teid " TEID_FMT "\n",
+      context_teid);
+  if ((send_msg_to_task(&grpc_service_task_zmq_ctx, TASK_SGW_S8, message_p)) !=
+      RETURNok) {
+    OAILOG_ERROR_UE(
+        LOG_SGW_S8, imsi64,
+        "Failed to send delete session response to sgw_s8 task for"
+        "context_teid " TEID_FMT "\n",
+        context_teid);
+  }
   OAILOG_FUNC_OUT(LOG_SGW_S8);
 }
 
@@ -391,15 +435,18 @@ void send_s8_delete_session_request(
     imsi64_t imsi64, Imsi_t imsi, teid_t sgw_s11_teid, teid_t pgw_s5_teid,
     ebi_t bearer_id) {
   OAILOG_FUNC_IN(LOG_SGW_S8);
-  std::cout << "Sending delete session request for IMSI: " << imsi64
-            << "and context_teid: " << sgw_s11_teid << std::endl;
+  OAILOG_INFO_UE(
+      LOG_SGW_S8, imsi64,
+      "Sending delete session request for context_teid:" TEID_FMT "\n",
+      sgw_s11_teid);
 
   magma::feg::DeleteSessionRequestPgw dsr_req;
 
   dsr_req.Clear();
   dsr_req.set_imsi((char*) imsi.digit, imsi.length);
   dsr_req.set_bearer_id(bearer_id);
   dsr_req.mutable_c_pgw_fteid()->set_teid(pgw_s5_teid);
+  dsr_req.set_c_agw_teid(sgw_s11_teid);
   magma::S8Client::s8_delete_session_request(
       dsr_req,
       [imsi64, sgw_s11_teid](
diff --git a/lte/gateway/c/oai/tasks/mme_app/mme_app_bearer.c b/lte/gateway/c/oai/tasks/mme_app/mme_app_bearer.c
@@ -84,6 +84,9 @@
 extern task_zmq_ctx_t mme_app_task_zmq_ctx;
 extern int pdn_connectivity_delete(emm_context_t* emm_context, pdn_cid_t pid);
 
+static void send_s11_modify_bearer_request(
+    ue_mm_context_t* ue_context_p, MessageDef* message_p);
+
 int send_modify_bearer_req(mme_ue_s1ap_id_t ue_id, ebi_t ebi) {
   OAILOG_FUNC_IN(LOG_MME_APP);
 
@@ -187,11 +190,7 @@ int send_modify_bearer_req(mme_ue_s1ap_id_t ue_id, ebi_t ebi) {
 
   message_p->ittiMsgHeader.imsi = ue_context_p->emm_context._imsi64;
 
-  OAILOG_INFO_UE(
-      LOG_MME_APP, ue_context_p->emm_context._imsi64,
-      "Sending S11_MODIFY_BEARER_REQUEST to SGW for ue" MME_UE_S1AP_ID_FMT "\n",
-      ue_id);
-  send_msg_to_task(&mme_app_task_zmq_ctx, TASK_SPGW, message_p);
+  send_s11_modify_bearer_request(ue_context_p, message_p);
   OAILOG_FUNC_RETURN(LOG_MME_APP, RETURNok);
 }
 
@@ -1527,7 +1526,8 @@ static int mme_app_send_modify_bearer_request_for_active_pdns(
     mme_app_build_modify_bearer_request_message(
         ue_context_p, initial_ctxt_setup_rsp_p, s11_modify_bearer_request, &pid,
         &bc_to_be_removed_idx);
-    send_msg_to_task(&mme_app_task_zmq_ctx, TASK_SPGW, message_p);
+
+    send_s11_modify_bearer_request(ue_context_p, message_p);
   }  // end of for loop
 
   OAILOG_FUNC_RETURN(LOG_MME_APP, RETURNok);
@@ -3431,11 +3431,7 @@ void mme_app_handle_path_switch_request(
 
   message_p->ittiMsgHeader.imsi = ue_context_p->emm_context._imsi64;
 
-  OAILOG_DEBUG_UE(
-      LOG_MME_APP, ue_context_p->emm_context._imsi64,
-      "MME_APP send S11_MODIFY_BEARER_REQUEST to teid %u \n",
-      s11_modify_bearer_request->teid);
-  send_msg_to_task(&mme_app_task_zmq_ctx, TASK_SPGW, message_p);
+  send_s11_modify_bearer_request(ue_context_p, message_p);
   ue_context_p->path_switch_req = true;
 
   OAILOG_FUNC_OUT(LOG_MME_APP);
@@ -3942,11 +3938,7 @@ void mme_app_handle_e_rab_modification_ind(
 
   message_p->ittiMsgHeader.imsi = ue_context_p->emm_context._imsi64;
 
-  OAILOG_DEBUG_UE(
-      LOG_MME_APP, ue_context_p->emm_context._imsi64,
-      "MME_APP send S11_MODIFY_BEARER_REQUEST to teid %u \n",
-      s11_modify_bearer_request->teid);
-  send_msg_to_task(&mme_app_task_zmq_ctx, TASK_SPGW, message_p);
+  send_s11_modify_bearer_request(ue_context_p, message_p);
   OAILOG_FUNC_OUT(LOG_MME_APP);
 }
 //------------------------------------------------------------------------------
@@ -4086,3 +4078,30 @@ void mme_app_handle_modify_bearer_rsp(
   }
   OAILOG_FUNC_OUT(LOG_MME_APP);
 }
+
+void send_s11_modify_bearer_request(
+    ue_mm_context_t* ue_context_p, MessageDef* message_p) {
+  OAILOG_FUNC_IN(LOG_MME_APP);
+  Imsi_t imsi = {0};
+  IMSI64_TO_STRING(
+      ue_context_p->emm_context._imsi64, (char*) (&imsi.digit),
+      ue_context_p->emm_context._imsi.length);
+
+  if (mme_app_match_fed_mode_map(
+          imsi.digit, ue_context_p->emm_context._imsi64) == S8_SUBSCRIBER) {
+    OAILOG_INFO_UE(
+        LOG_MME_APP, ue_context_p->emm_context._imsi64,
+        "Sending S11 modify bearer req message to SGW_s8 task for "
+        "ue_id " MME_UE_S1AP_ID_FMT "\n",
+        ue_context_p->mme_ue_s1ap_id);
+    send_msg_to_task(&mme_app_task_zmq_ctx, TASK_SGW_S8, message_p);
+  } else {
+    OAILOG_INFO_UE(
+        LOG_MME_APP, ue_context_p->emm_context._imsi64,
+        "Sending S11 modify bearer req message to SPGW task for "
+        "ue_id " MME_UE_S1AP_ID_FMT "\n",
+        ue_context_p->mme_ue_s1ap_id);
+    send_msg_to_task(&mme_app_task_zmq_ctx, TASK_SPGW, message_p);
+  }
+  OAILOG_FUNC_OUT(LOG_MME_APP);
+}
diff --git a/lte/gateway/c/oai/tasks/mme_app/mme_app_detach.c b/lte/gateway/c/oai/tasks/mme_app/mme_app_detach.c
@@ -32,6 +32,7 @@
 #include <stdbool.h>
 
 #include "log.h"
+#include "conversions.h"
 #include "intertask_interface.h"
 #include "gcc_diag.h"
 #include "mme_config.h"
@@ -115,10 +116,26 @@ void mme_app_send_delete_session_request(
 
   message_p->ittiMsgHeader.imsi = ue_context_p->emm_context._imsi64;
 
-  send_msg_to_task(&mme_app_task_zmq_ctx, TASK_SPGW, message_p);
-  OAILOG_INFO(
-      LOG_MME_APP, "Send Delete session Req for teid " TEID_FMT "\n",
-      ue_context_p->mme_teid_s11);
+  Imsi_t imsi = {0};
+  IMSI64_TO_STRING(
+      ue_context_p->emm_context._imsi64, (char*) (&imsi.digit),
+      ue_context_p->emm_context._imsi.length);
+
+  if (mme_app_match_fed_mode_map(
+          imsi.digit, ue_context_p->emm_context._imsi64) == S8_SUBSCRIBER) {
+    OAILOG_INFO_UE(
+        LOG_MME_APP, ue_context_p->emm_context._imsi64,
+        "Send delete session Req for teid to sgw_s8 task " TEID_FMT "\n",
+        ue_context_p->mme_teid_s11);
+    send_msg_to_task(&mme_app_task_zmq_ctx, TASK_SGW_S8, message_p);
+  } else {
+    OAILOG_INFO_UE(
+        LOG_MME_APP, ue_context_p->emm_context._imsi64,
+        "Send delete session Req for teid to spgw task " TEID_FMT "\n",
+        ue_context_p->mme_teid_s11);
+    send_msg_to_task(&mme_app_task_zmq_ctx, TASK_SPGW, message_p);
+  }
+
   increment_counter("mme_spgw_delete_session_req", 1, NO_LABELS);
   OAILOG_FUNC_OUT(LOG_MME_APP);
 }
diff --git a/lte/gateway/c/oai/tasks/mme_app/mme_app_itti_messaging.c b/lte/gateway/c/oai/tasks/mme_app/mme_app_itti_messaging.c
@@ -374,19 +374,22 @@ int mme_app_send_s11_create_session_req(
       ue_mm_context->e_utran_cgi.plmn.mnc_digit3;
   session_request_p->selection_mode = MS_O_N_P_APN_S_V;
 
-  OAILOG_INFO_UE(
-      LOG_MME_APP, ue_mm_context->emm_context._imsi64,
-      "Sending S11 CREATE SESSION REQ message to SPGW for "
-      "ue_id " MME_UE_S1AP_ID_FMT "\n",
-      ue_mm_context->mme_ue_s1ap_id);
-  if ((send_msg_to_task(&mme_app_task_zmq_ctx, TASK_SPGW, message_p)) !=
-      RETURNok) {
-    OAILOG_ERROR_UE(
+  if (mme_app_match_fed_mode_map(
+          session_request_p->imsi.digit, ue_mm_context->emm_context._imsi64) ==
+      S8_SUBSCRIBER) {
+    OAILOG_INFO_UE(
         LOG_MME_APP, ue_mm_context->emm_context._imsi64,
-        "Failed to send S11 CREATE SESSION REQ message to SPGW for "
+        "Sending s11 create session req message to SGW_s8 task for "
         "ue_id " MME_UE_S1AP_ID_FMT "\n",
         ue_mm_context->mme_ue_s1ap_id);
-    OAILOG_FUNC_RETURN(LOG_MME_APP, RETURNerror);
+    send_msg_to_task(&mme_app_task_zmq_ctx, TASK_SGW_S8, message_p);
+  } else {
+    OAILOG_INFO_UE(
+        LOG_MME_APP, ue_mm_context->emm_context._imsi64,
+        "Sending s11 create session req message to SPGW task for "
+        "ue_id " MME_UE_S1AP_ID_FMT "\n",
+        ue_mm_context->mme_ue_s1ap_id);
+    send_msg_to_task(&mme_app_task_zmq_ctx, TASK_SPGW, message_p);
   }
   OAILOG_FUNC_RETURN(LOG_MME_APP, RETURNok);
 }
@@ -642,3 +645,44 @@ void mme_app_itti_sgsap_ue_activity_ind(
   }
   OAILOG_FUNC_OUT(LOG_MME_APP);
 }
+
+// Extract MCC and MNC from the imsi received and match with
+// configuration
+int mme_app_match_fed_mode_map(const uint8_t* imsi, imsi64_t imsi64) {
+  uint8_t mcc_d1 = imsi[0] - '0';
+  uint8_t mcc_d2 = imsi[1] - '0';
+  uint8_t mcc_d3 = imsi[2] - '0';
+  uint8_t mnc_d1 = imsi[3] - '0';
+  uint8_t mnc_d2 = imsi[4] - '0';
+  uint8_t mnc_d3 = imsi[5] - '0';
+  if ((mcc_d1 < 0 || mcc_d1 > 9) || (mcc_d2 < 0 || mcc_d2 > 9) ||
+      (mcc_d3 < 0 || mcc_d3 > 9) || (mnc_d1 < 0 || mnc_d1 > 9) ||
+      (mnc_d2 < 0 || mnc_d2 > 9) || (mnc_d3 < 0 || mnc_d3 > 9)) {
+    OAILOG_ERROR_UE(
+        LOG_MME_APP, imsi64, "[ERROR] MCC/MNC is not a decimal digit \n");
+    OAILOG_FUNC_RETURN(LOG_MME_APP, RETURNerror);
+  }
+  for (uint8_t itr = 0; itr < mme_config.mode_map_config.num; itr++) {
+    if (((mcc_d1 == mme_config.mode_map_config.mode_map[itr].plmn.mcc_digit1) &&
+         (mcc_d2 == mme_config.mode_map_config.mode_map[itr].plmn.mcc_digit2) &&
+         (mcc_d3 == mme_config.mode_map_config.mode_map[itr].plmn.mcc_digit3) &&
+         (mnc_d1 == mme_config.mode_map_config.mode_map[itr].plmn.mnc_digit1) &&
+         (mnc_d2 ==
+          mme_config.mode_map_config.mode_map[itr].plmn.mnc_digit2))) {
+      if (mme_config.mode_map_config.mode_map[itr].plmn.mnc_digit3 != 0xf) {
+        if (mnc_d3 !=
+            mme_config.mode_map_config.mode_map[itr].plmn.mnc_digit3) {
+          continue;
+        }
+      }
+      OAILOG_FUNC_RETURN(
+          LOG_MME_APP, mme_config.mode_map_config.mode_map[itr].mode);
+    }
+  }
+  // If the plmn is not configured set the default mode as hss + spgw_task.
+  OAILOG_INFO_UE(
+      LOG_MME_APP, imsi64,
+      "PLMN is not configured. Selecting default mode: SPGW_SUBSCRIBER \n");
+  OAILOG_FUNC_RETURN(LOG_MME_APP, SPGW_SUBSCRIBER);
+}
+
diff --git a/lte/gateway/c/oai/tasks/mme_app/mme_app_itti_messaging.h b/lte/gateway/c/oai/tasks/mme_app/mme_app_itti_messaging.h
@@ -132,4 +132,5 @@ void mme_app_itti_sgsap_tmsi_reallocation_comp(
 void mme_app_itti_sgsap_ue_activity_ind(
     const char* imsi, const unsigned int imsi_len);
 
+int mme_app_match_fed_mode_map(const uint8_t* imsi, imsi64_t imsi64);
 #endif /* FILE_MME_APP_ITTI_MESSAGING_SEEN */
diff --git a/lte/gateway/c/oai/tasks/sgw_s8/sgw_s8_handlers.c b/lte/gateway/c/oai/tasks/sgw_s8/sgw_s8_handlers.c
diff --git a/lte/gateway/c/oai/tasks/sgw_s8/sgw_s8_s11_handlers.h b/lte/gateway/c/oai/tasks/sgw_s8/sgw_s8_s11_handlers.h
diff --git a/lte/gateway/c/oai/tasks/sgw_s8/sgw_s8_task.c b/lte/gateway/c/oai/tasks/sgw_s8/sgw_s8_task.c
