- Fix incorrect SCTP stream for UE

- Added some message for S1AP
- Fixed PLMN for EPC

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

openair-cn/S1AP/s1ap_eNB_handlers.c

@@ -353,7 +353,8 @@ int s1ap_eNB_handle_initial_context_request(uint32_t               assoc_id,
     if ((ue_desc_p = s1ap_eNB_get_ue_context(mme_desc_p->s1ap_eNB_instance,
                      initialContextSetupRequest_p->eNB_UE_S1AP_ID)) == NULL) {
         S1AP_ERROR("[SCTP %d] Received initial context setup request for non "
-                   "existing UE context\n", assoc_id);
+        "existing UE context %06x\n", assoc_id,
+        initialContextSetupRequest_p->eNB_UE_S1AP_ID);
         return -1;
     }
 

openair-cn/S1AP/s1ap_eNB_nas_procedures.c

@@ -113,7 +113,9 @@ int s1ap_eNB_handle_nas_first_req(s1ap_nas_first_req_t *s1ap_nas_first_req_p)
         /* Peek a random value for the eNB_ue_s1ap_id */
         ue_desc_p->eNB_ue_s1ap_id = (random() + random()) & 0x00ffffff;
         if ((collision_p = RB_INSERT(s1ap_ue_map, &instance_p->s1ap_ue_head, ue_desc_p))
-                == NULL) {
+                == NULL)
+        {
+            S1AP_DEBUG("Found usable eNB_ue_s1ap_id: 0x%06x\n", ue_desc_p->eNB_ue_s1ap_id);
             /* Break the loop as the id is not already used by another UE */
             break;
         }
@@ -164,12 +166,16 @@ int s1ap_eNB_handle_nas_first_req(s1ap_nas_first_req_t *s1ap_nas_first_req_p)
 
     if (s1ap_eNB_encode_pdu(&message, &buffer, &length) < 0) {
         /* Failed to encode message */
-        return -1;
+        DevMessage("Failed to encode initial UE message\n");
     }
 
     /* Update the current S1AP UE state */
     ue_desc_p->ue_state = S1AP_UE_WAITING_CSR;
 
+    /* Assign a stream for this UE */
+    mme_desc_p->nextstream %= mme_desc_p->out_streams;
+    ue_desc_p->stream = ++mme_desc_p->nextstream;
+
     /* Send encoded message over sctp */
     s1ap_eNB_itti_send_sctp_data_req(mme_desc_p->assoc_id, buffer, length, ue_desc_p->stream);