Merge branch 'rsarwad_handle_mbr_in_s8' of https://github.com/rsarwad/magma into rsarwad_handle_dsr_in_s8_task

Signed-off-by: rashmi <[email protected]>

Author: rsarwad

lte/gateway/c/oai/tasks/mme_app/mme_config.c

@@ -958,10 +958,10 @@ int mme_config_parse_file(mme_config_t* config_pP) {
             // Convert to 3gpp PLMN (MCC and MNC) format
             // First 3 chars in astring is MCC next 3 or 2 chars is MNC
             memcpy(fed_mode_mcc, astring, MAX_MCC_LENGTH);
-            fed_mode_mcc[MAX_MCC_LENGTH] = '\0'; // null terminated string
-            n = strlen(astring) - MAX_MCC_LENGTH;
+            fed_mode_mcc[MAX_MCC_LENGTH] = '\0';  // null terminated string
+            n                            = strlen(astring) - MAX_MCC_LENGTH;
             memcpy(fed_mode_mnc, astring + MAX_MCC_LENGTH, n);
-            fed_mode_mnc[n] = '\0'; // null terminated string
+            fed_mode_mnc[n] = '\0';  // null terminated string
             AssertFatal(
                 strlen(fed_mode_mcc) == MAX_MCC_LENGTH,
                 "Bad MCC length (%ld), it must be %u digit ex: 001\n",

lte/gateway/c/oai/tasks/sgw_s8/sgw_s8_handlers.c

@@ -267,7 +267,8 @@ void sgw_s8_handle_s11_create_session_request(
   memcpy(
       new_sgw_eps_context->imsi.digit, session_req_pP->imsi.digit,
       IMSI_BCD_DIGITS_MAX);
-  new_sgw_eps_context->imsi64 = imsi64;
+  new_sgw_eps_context->imsi.length = session_req_pP->imsi.length;
+  new_sgw_eps_context->imsi64      = imsi64;
 
   new_sgw_eps_context->imsi_unauthenticated_indicator = 1;
   new_sgw_eps_context->mme_teid_S11 = session_req_pP->sender_fteid_for_cp.teid;