Commit Graph
92 Commits
Author SHA1 Message Date
Xue Song 124ccbf14c modify pdusession modify procedure 2021-09-14 09:53:42 +00:00
Xue Song 64a7359a4c set fiveQI in ngap_gNB_handle_pdusession_modify_request() 2021-09-13 07:59:22 +00:00
Xue Song 9a09335495 add rrc_gNB_modify_dedicatedRRCReconfiguration()
add rrc_gNB_process_NGAP_PDUSESSION_MODIFY_REQ()
add rrc_gNB_send_NGAP_PDUSESSION_MODIFY_RESP()
2021-09-10 08:41:21 +00:00
Xue Song 7379717ddf Remove duplicate code
In the UE executable, delete the initialization of NR.nrrrc and check the NULL of NR.nrrrc
2021-05-31 17:36:18 +09:00
Xue Song c273a9d356 fix problem about CU/DU c-plane failed 2021-03-05 19:43:42 +09:00
Xue Song 834d6f1055 Merge branch 'master' into NR_SA_F1AP_RFSIMULATOR3_Lo
Conflicts:
	cmake_targets/CMakeLists.txt
	executables/nr-softmodem.c
	executables/nr-uesoftmodem.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
2021-03-05 19:07:43 +09:00
Xue Song b6febe214f add GTPV1U_GNB_TUNNEL_DATA_REQ and UDP_DATA_IND
if the UE is running with noS1, u-plane for rfsim with Free5GC + CU/DU is OK
2021-02-25 14:00:14 +09:00
Xue Song bd765c7505 C-plane for rfsim with Free5GC + CU/DU separation is OK 2021-02-16 14:14:55 +09:00
Xue Song 5918c03cd4 add nrue nas task 2021-02-16 14:14:46 +09:00
Xue Song e1a92eadba Merge branch 'master' into develop_SA_rfsim_for_F1
Conflicts:
	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NGAP/ngap_gNB.c
	openair3/NGAP/ngap_gNB_nas_procedures.c
2021-02-10 15:56:50 +09:00
Xue Song 4cc81b0025 fix the problem that DL failed after merge 'master' branch 2021-02-05 11:59:54 +09:00
Xue Song 52edf0c123 Merge branch 'master' into develop_SA_rfsim_for_F1
Conflicts:
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
	openair2/F1AP/f1ap_cu_interface_management.c
	openair2/F1AP/f1ap_cu_rrc_message_transfer.c
	openair2/F1AP/f1ap_cu_task.c
	openair2/F1AP/f1ap_du_interface_management.c
	openair2/F1AP/f1ap_du_task.c
	openair2/GNB_APP/gnb_app.c
	openair2/GNB_APP/gnb_config.c
	openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
	openair2/RRC/NR/L2_nr_interface.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/L2_interface_ue.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NGAP/ngap_gNB.c
2021-02-04 18:16:37 +09:00
Xue Song 1dd6b3b2a0 fix some warnings 2021-02-04 11:30:44 +09:00
Xue Song 6a3b7b40a5 Merge branch 'master' into develop_SA_L3
Conflicts:
	openair2/GNB_APP/gnb_config.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
2021-02-03 14:58:07 +09:00
Xue Song 1721e82ed0 add F1AP Rel16 asn file 2021-02-01 14:12:18 +09:00
Xue Song a85f261b54 add license text
fix some problems
2021-02-01 13:59:56 +09:00
Xue Song cf3694be28 modify the f1 establishment process 2021-01-28 16:35:10 +09:00
Xue Song 36487515c4 fix double definition in rrc_gNB_NGAP.c and nr_ngap_gnb.c 2021-01-28 14:20:35 +09:00
Xue Song 874246b3f9 fix the problem of f1ap setup response message encoding error 2021-01-26 18:07:13 +09:00
Xue Song d9934436c3 fix some cppcheck errors 2021-01-25 14:26:39 +09:00
Xue Song 84d3cfb12f fix some warnings 2021-01-22 18:24:28 +09:00
Xue Song 76cb132f2d u-plane is ok 2021-01-22 15:44:18 +09:00
Xue Song 4c1e47405f update F1AP to R16.3.1 2021-01-21 14:56:22 +09:00
Xue Song 73ff5dec81 modify INITIAL_UL_RRC_MESSAGE_TRANSFER
fix build errors about nrUE
c-plane is ok
2021-01-20 15:13:49 +09:00
Xue Song 4ea8b38d37 c-plane is ok 2021-01-19 18:19:59 +09:00
Xue Song 133ecd52fa msg1/2/3/4/5 is ok 2021-01-16 18:00:03 +09:00
Xue Song 02e8add383 Merge branch 'develop_SA_rfsim_for_F1' of http://10.37.193.133:8000/gitlab/vran/OAI-5GNR into develop_SA_rfsim_for_F1 2021-01-15 19:58:31 +09:00
Xue Song 01a87a1fba split gNB into CU and DU 2021-01-15 19:57:26 +09:00
Xue Song 28168f1369 fix build errors 2021-01-12 07:14:19 +00:00
Xue Song d923011ec8 change NR_RRC_DCCH_DATA_REQ in nr_rrc_data_req to RRC_DCCH_DATA_REQ 2021-01-12 05:59:01 +00:00
Xue Song e0419baeb3 Merge branch 'ngap-wf-1120-srb' into develop_SA_rfsim_for_F1
Conflicts:
        cmake_targets/CMakeLists.txt
        openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
        openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
        openair1/SCHED_NR/phy_procedures_nr_gNB.c
        openair2/RRC/NR/rrc_gNB.c
        openair2/RRC/NR_UE/rrc_UE.c
        openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
        openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
        openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
        openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
        openair2/LAYER2/NR_MAC_gNB/main.c
        openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
        openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
        openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
        openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
        openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
2021-01-12 05:37:09 +00:00
Xue Song bc2b462ea4 fix eNB compile error 2021-01-07 18:48:53 +09:00
Xue Song b0a76fd662 add du handle f1ap setup response 2020-12-24 02:58:29 +00:00
Xue Song 1fcd879f97 modify F1 Setup Response
add rrc_gNB_process_f1_setup_req
2020-12-23 10:03:04 +00:00
Xue Song 1cc09da83f Merge branch 'develop_SA_L3' into develop_SA_F1
Conflicts:
	openair2/GNB_APP/gnb_config.c
	openair2/RRC/NR/rrc_gNB.c
2020-12-23 15:11:17 +09:00
Xue Song cb0d7c3dd5 modify F1 Setup Request 2020-12-23 01:58:17 +00:00
Xue Song f09c6fbd0d Add RCconfig_NR_DU_F1
Initialize F1AP
2020-12-22 01:29:23 +00:00
Xue Song 8d5f99d088 fix the problem of ittiSIM compilation error 2020-12-21 16:12:58 +09:00
Xue Song d0be64cbd0 add DU_handle_F1_SETUP_FAILURE 2020-12-21 01:50:28 +00:00
Xue Song 08511b8207 fix some warnings
modify some issues
add f1ap ue context procedure
2020-12-20 08:59:50 +00:00
Xue Song ec29831e16 modify F1AP_DL_RRC_MESSAGE in RRC
add DU_handle_DL_NR_RRC_MESSAGE_TRANSFER
2020-12-18 11:17:12 +00:00
Xue Song 7b859b7238 add F1AP_DL_RRC_MESSAGE in NR RRC 2020-12-18 03:06:08 +00:00
Xue Song 5936c80b0b RRCSetup docking with F1AP 2020-12-17 08:35:24 +00:00
Xue Song 45ec62f963 read config about f1 2020-12-17 05:50:57 +00:00
Xue Song a53d6795c8 fix some errors about rrcReestablishment 2020-12-17 12:21:06 +09:00
Xue Song 40e3c0ce95 modify rrcReestablishmentRequest 2020-12-14 18:50:12 +09:00
Xue Song 9dce92eafe implement rrcReestablishmentRequest 2020-12-11 14:59:34 +09:00
Xue Song ce3a97080a Modify RRCReconfiguration message 2020-11-26 18:19:59 +09:00
Xue Song 6e2f63bf1f Add rrc_gNB_process_NGAP_PDUSESSION_RELEASE_COMMAND and rrc_gNB_send_NGAP_PDUSESSION_RELEASE_RESPONSE 2020-11-25 18:55:59 +09:00
Xue Song 598eeb79d4 Derive keys from kgnb 2020-11-24 11:58:33 +09:00
Xue Song e524cd9482 Add rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ
Add rrc_gNB_send_NGAP_PDUSESSION_SETUP_RESP
Fix some problems about pdu session setup
2020-11-17 19:03:55 +09:00
Xue Song 9bba3c795a Fix GTPU's IP setting error 2020-11-09 18:04:56 +09:00
Xue Song 04897ab64f Fix GTPU's IP setting error 2020-11-09 08:32:57 +00:00
Xue Song 7bef73bfa8 set nas message container for security mode complete 2020-11-05 07:57:05 +00:00
Xue Song 89eae04132 Add NAS Security Mode Complete 2020-11-03 09:58:23 +00:00
Xue Song 9fddd09dc3 Fix build warning
Modify SecurityModeFailure
2020-10-29 07:31:26 +00:00
Xue Song b6e038e044 add NAS up/downlink 2020-10-28 09:54:03 +00:00
Xue Song ca4e85553f Add ITTI_SIM in rrc_gNB_generate_RRCRelease 2020-10-28 05:34:46 +00:00
Xue Song 456329b527 modify RRCRelease 2020-10-28 02:56:55 +00:00
Xue Song 90fbe805bb modify RRCRelease 2020-10-28 02:05:01 +00:00
Xue Song 356a4d83e9 fix nrUE build error 2020-10-27 07:41:53 +00:00
Xue Song 41d3892c64 Merge branch 'develop_SA_NGAP' into develop_SA_RRC 2020-10-27 02:51:57 +00:00
Xue Song 62292f892e modify ngap_gNB_handle_nas_first_req 2020-10-27 01:56:41 +00:00
Xue Song d5f95c6c79 fix some error 2020-10-23 08:00:21 +00:00
Xue Song ce85677762 modify some issues 2020-10-23 03:42:06 +00:00
Xue Song 592642cb28 modify RRC messages 2020-10-21 02:46:40 +00:00
Xue Song 4766f3a629 fix RRCReconfiguration/RRCReconfigurationComplete 2020-10-19 07:58:10 +00:00
Xue Song dfa50d975b Modify RRCSetupComplete 2020-10-16 08:42:28 +00:00
Xue Song 5697057f0b Unblock ITTI SIM process 2020-10-16 05:06:19 +00:00
Xue Song a76ef07a69 Merge branch 'develop_SA_RRC' into develop_SA_SIM 2020-10-16 01:48:23 +00:00
Xue Song 43ef53cbcf Add pucchresset->maxPayloadMinus1 to be compatible with Rel15 2020-10-16 01:46:15 +00:00
Xue Song 878b483746 Merge branch 'develop_SA_RRC' into develop_SA_SIM 2020-10-13 11:37:45 +00:00
Xue Song 9812545c61 modify rrc_gNB_generate_RRCSetup 2020-10-13 11:36:52 +00:00
Xue Song 38516da2dc Merge branch 'develop_SA_RRC' into develop_SA_SIM 2020-10-13 10:48:46 +00:00
Xue Song 0f378cf3da modify RRCSetup 2020-10-13 10:48:01 +00:00
Xue Song db410e41a6 Merge branch 'develop_SA_RRC' into develop_SA_SIM 2020-10-13 09:31:16 +00:00
Xue Song 8c421698c4 modify do_RRCSetup 2020-10-13 09:07:19 +00:00
Xue Song f6d5e5f95d handle dcch message in rrc_nrue_task 2020-10-13 02:11:39 +00:00
Xue Song f4f8db4373 Merge branch 'develop_SA_RRC' into develop_SA_SIM
Modify RRCReconfiguration
2020-10-12 04:59:49 +00:00
Xue Song 994229963b Modify RRCReconfiguration 2020-10-12 02:59:22 +00:00
Xue Song fefb6148e6 Modify some warnings
Add nr_rrc_pdcp_config_security
Delete ENABLE_SECURITY
2020-10-10 06:18:40 +00:00
Xue Song aa8e695d59 Fix compiling error 2020-10-10 03:24:06 +00:00
Xue Song 97dd024c1d Fix some issues 2020-10-07 08:57:30 +00:00
Xue Song b331fc9af6 Add rrc_ue_process_rrcReconfiguration
->nr_rrc_ue_process_measConfig
    ->nr_rrc_ue_process_radioBearerConfig
Modify RRCReconfiguration message (gnb->ue)
2020-09-30 08:15:22 +00:00
Xue Song 118ac391ad Modify some warnings
Add nr_rrc_pdcp_config_security
Delete ENABLE_SECURITY
2020-09-29 06:11:02 +00:00
Xue Song b5f58b7d22 Add RRCReconfigurationComplete message
Modify compilation warning
2020-09-25 10:27:27 +00:00
Xue Song caff16a6d1 Add RRCReconfiguration message 2020-09-24 03:00:43 +00:00
Xue Song e5216cdba3 Handle NGAP Initial Context Setup Request message from NGAP task 2020-09-17 07:55:05 +00:00
Xue Song 679b6be9be Modify RRCSetupRequest message
Add RRCSetupComplete message
2020-09-17 03:18:56 +00:00
Xue Song a81b655c3f Add RRC Setup message 2020-09-15 10:33:30 +00:00
Xue Song 3f02d18f86 NR RRC ASN1 version upgrade release 16
Add RRCSetupRequest message
Add RRCReject message
2020-09-12 10:23:31 +00:00
Xue Song bdd31eb852 fix the problem that nr-rrc-16.1.0.asn1 cannot generate C files 2020-09-10 08:23:28 +00:00