rrc pass under 5gc231121

executables/gnbSendToManager_client.c

@@ -75,7 +75,8 @@ void *gnbSendToManager_task(void *args_p)
 
 		// printf("message_flag %d\n", message_flag);
 		if 	(message_flag == 1){
-			// printf("data_len %d\n", sim_rrc_signaling_socket.data_len);
+			// printf("data_len %d rrc_signaling_request_type %d rrc_signaling_type %d \n", sim_rrc_signaling_socket.data_len, 
+			// 		sim_rrc_signaling_socket.rrc_signaling_request_type, sim_rrc_signaling_socket.rrc_signaling_type);
 			send_len = write(sockfd, &sim_rrc_signaling_socket, GNBSENDTOMANAGER_MAX_RRC_SIGNALING_LEN); 
 		}
 		else if (message_flag == 2){

executables/sever_manager_py.py

@@ -76,7 +76,8 @@ while True:
         print("data_len %d message %d"%(data_len,message))
     if (message == 2):
         CC_id,frame,slot,measurement_flag,pbch_sched_flag,random_access_sched_flag,dl_sched_flag,ul_sched_flag = struct.unpack("8H", data[4:20]) 
-        print("%d.%d measurement_flag %x pbch_sched_flag %x random_access_sched_flag %x dl_sched_flag %x ul_sched_flag %x"%(frame,slot,measurement_flag,pbch_sched_flag,random_access_sched_flag,dl_sched_flag,ul_sched_flag))
+        if DEBUG_PRINT:
+            print("%d.%d measurement_flag %x pbch_sched_flag %x random_access_sched_flag %x dl_sched_flag %x ul_sched_flag %x"%(frame,slot,measurement_flag,pbch_sched_flag,random_access_sched_flag,dl_sched_flag,ul_sched_flag))
         schedule_timing = struct.unpack("30H", data[20:80]) 
         if DEBUG_PRINT:
             i = 0
@@ -125,16 +126,17 @@ while True:
             count = count + 1
             
         frame_last = frame
-        print(schedule_data)
+        if DEBUG_PRINT:
+            print(schedule_data)
         
     elif (message == 1):
-        rnti,recv_send_flag,rrc_signaling_type,rrc_signaling_request_type = struct.unpack("4H", data[4:12])
-        if DEBUG_PRINT:
-            print("rrc_signaling_type %d rrc_signaling_request_type %d"%(rrc_signaling_type,rrc_signaling_request_type))
-            if (recv_send_flag == 0):
-                print("Send:UE(rnti:%x), Receive:gNB, RRC signaling:%s"%(rnti, rrc_UE_to_gNB[rrc_signaling_request_type]))
-            elif (recv_send_flag == 1):
-                print("Send:gNB, Receive:UE(rnti:%x), RRC signaling:%s"%(rnti, rrc_gNB_to_UE[rrc_signaling_type]))
+        rnti,recv_send_flag,rrc_signaling_type,rrc_signaling_request_type = struct.unpack("2H2I", data[4:16])
+        # if DEBUG_PRINT:
+        print("rrc_signaling_type %d rrc_signaling_request_type %d"%(rrc_signaling_type,rrc_signaling_request_type))
+        if rrc_signaling_request_type != 0 :
+            print("Send:UE(rnti:%x), Receive:gNB, RRC signaling:%s"%(rnti, rrc_UE_to_gNB[rrc_signaling_request_type-1]))
+        if rrc_signaling_type != 0 :
+            print("Send:gNB, Receive:UE(rnti:%x), RRC signaling:%s"%(rnti, rrc_gNB_to_UE[rrc_signaling_type-1]))
 
 server_socket.close()
 

openair2/RRC/NR/rrc_signaling_socket.h

@@ -2,7 +2,7 @@
 #define __RRC_SIGNALING_SOCKET__
 
 typedef enum{
-    RRC_SetupRequest_manager,
+    RRC_SetupRequest_manager=1,
     RRC_ReestablishmentRequest_manager,
     RRC_ReconfigurationComplete_manager,
     RRC_SetupComplete_manager,
@@ -16,7 +16,7 @@ typedef enum{
 }rrc_sigaling_fromUE_t;
 
 typedef enum{
-    RRC_Reject_manager,
+    RRC_Reject_manager=1,
     RRC_SETUP_manager,
     RRC_Reestablishment_manager,
     RRC_REESTABLISH_COMPLETE_manager,