modify rrc rnti send 231205

openair2/RRC/NR/rrc_gNB.c

@@ -940,7 +940,7 @@ static void rrc_gNB_process_RRCReconfigurationComplete(const protocol_ctxt_t *co
   sim_rrc_signaling_socket.data_len = sizeof(sim_rrc_signaling_socket);
   sim_rrc_signaling_socket.rrc_signaling_request_type = RRC_ReconfigurationComplete_manager;
   sim_rrc_signaling_socket.recv_send_flag = 0;
-  sim_rrc_signaling_socket.rnti = ctxt_pP->rntiMaybeUEid;
+  sim_rrc_signaling_socket.rnti = ue_context_pP->ue_context.rnti;
   sim_rrc_signaling_socket.message = 1;
   pthread_mutex_unlock(&sim_mutex_socket);
   sem_post(&gnbSendToManager_sem);
@@ -1512,7 +1512,7 @@ static int handle_ueCapabilityInformation(const protocol_ctxt_t *const ctxt_pP,
   sim_rrc_signaling_socket.data_len = sizeof(sim_rrc_signaling_socket);
   sim_rrc_signaling_socket.rrc_signaling_request_type = RRC_ueCapabilityInformation_manager;
   sim_rrc_signaling_socket.recv_send_flag = 0;
-  sim_rrc_signaling_socket.rnti = ctxt_pP->rntiMaybeUEid;
+  sim_rrc_signaling_socket.rnti = ue_context_p->ue_context.rnti;
   sim_rrc_signaling_socket.message = 1;
   pthread_mutex_unlock(&sim_mutex_socket);
   sem_post(&gnbSendToManager_sem);
@@ -1674,7 +1674,7 @@ static int handle_rrcSetupComplete(const protocol_ctxt_t *const ctxt_pP,
   sim_rrc_signaling_socket.data_len = sizeof(sim_rrc_signaling_socket);
   sim_rrc_signaling_socket.rrc_signaling_request_type = RRC_SetupComplete_manager;
   sim_rrc_signaling_socket.recv_send_flag = 0;
-  sim_rrc_signaling_socket.rnti = ctxt_pP->rntiMaybeUEid;
+  sim_rrc_signaling_socket.rnti = ue_context_p->ue_context.rnti;
   sim_rrc_signaling_socket.message = 1;
   pthread_mutex_unlock(&sim_mutex_socket);
   sem_post(&gnbSendToManager_sem);
@@ -1701,7 +1701,7 @@ static void handle_rrcReconfigurationComplete(const protocol_ctxt_t *const ctxt_
     sim_rrc_signaling_socket.data_len = sizeof(sim_rrc_signaling_socket); 
     sim_rrc_signaling_socket.rrc_signaling_type = UE->xids[xid];
     sim_rrc_signaling_socket.recv_send_flag = 1;
-    sim_rrc_signaling_socket.rnti = ctxt_pP->rntiMaybeUEid;
+    sim_rrc_signaling_socket.rnti = ue_context_p->ue_context.rnti;
     sim_rrc_signaling_socket.message = 1;
     pthread_mutex_unlock(&sim_mutex_socket);
     sem_post(&gnbSendToManager_sem);
@@ -1824,7 +1824,7 @@ int rrc_gNB_decode_dcch(const protocol_ctxt_t *const ctxt_pP,
         sim_rrc_signaling_socket.data_len = sizeof(sim_rrc_signaling_socket);
         sim_rrc_signaling_socket.rrc_signaling_request_type = RRC_ulInformationTransfer_manager;
         sim_rrc_signaling_socket.recv_send_flag = 0;
-        sim_rrc_signaling_socket.rnti = ctxt_pP->rntiMaybeUEid;
+        sim_rrc_signaling_socket.rnti = ue_context_p->ue_context.rnti;
         sim_rrc_signaling_socket.message = 1;
         pthread_mutex_unlock(&sim_mutex_socket);
         sem_post(&gnbSendToManager_sem);
@@ -1848,7 +1848,7 @@ int rrc_gNB_decode_dcch(const protocol_ctxt_t *const ctxt_pP,
         sim_rrc_signaling_socket.data_len = sizeof(sim_rrc_signaling_socket);
         sim_rrc_signaling_socket.rrc_signaling_request_type = RRC_securityModeComplete_manager;
         sim_rrc_signaling_socket.recv_send_flag = 0;
-        sim_rrc_signaling_socket.rnti = ctxt_pP->rntiMaybeUEid;
+        sim_rrc_signaling_socket.rnti = ue_context_p->ue_context.rnti;
         sim_rrc_signaling_socket.message = 1;
         pthread_mutex_unlock(&sim_mutex_socket);
         sem_post(&gnbSendToManager_sem);
@@ -1888,7 +1888,7 @@ int rrc_gNB_decode_dcch(const protocol_ctxt_t *const ctxt_pP,
         sim_rrc_signaling_socket.data_len = sizeof(sim_rrc_signaling_socket); 
         sim_rrc_signaling_socket.rrc_signaling_request_type = RRC_securityModeFailure_manager;
         sim_rrc_signaling_socket.recv_send_flag = 0;
-        sim_rrc_signaling_socket.rnti = ctxt_pP->rntiMaybeUEid;
+        sim_rrc_signaling_socket.rnti = ue_context_p->ue_context.rnti;
         sim_rrc_signaling_socket.message = 1;
         pthread_mutex_unlock(&sim_mutex_socket);
         sem_post(&gnbSendToManager_sem);
@@ -2929,7 +2929,7 @@ rrc_gNB_generate_UECapabilityEnquiry(
   sim_rrc_signaling_socket.data_len = sizeof(sim_rrc_signaling_socket);
   sim_rrc_signaling_socket.rrc_signaling_type = RRC_UECapabilityEnquiry_manager;
   sim_rrc_signaling_socket.recv_send_flag = 1;
-  sim_rrc_signaling_socket.rnti = ctxt_pP->rntiMaybeUEid;
+  sim_rrc_signaling_socket.rnti = ue_context_pP->ue_context.rnti;
   sim_rrc_signaling_socket.message = 1;
   pthread_mutex_unlock(&sim_mutex_socket);
   sem_post(&gnbSendToManager_sem);

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf

@@ -275,8 +275,8 @@ e2_agent = {
 };
 
 
-manager_platform = {
-  ip_address = "192.168.199.231";
-  ip_port = "7789";
-};
+# manager_platform = {
+#   ip_address = "192.168.199.225";
+#   ip_port = "7789";
+# };