maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,567 Commits 5 Branches 0 Tags
32b74d2f3827d66fe576df4ccb3ca8ca6e5e6bdd
Commit Graph
466 Commits
Author SHA1 Message Date
Raymond Knopp 32b74d2f38 nr-softmodem compilation after merge with develop 2021-02-25 01:00:34 +01:00
Raymond Knopp 4d9ebf0ac0 Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_RFSIMULATOR2 
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_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/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/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-24 23:00:04 +01:00
hardy accae67113 Merge remote-tracking branch 'origin/nr-pdcp-nea2-security' into integration_2021_wk08 2021-02-23 09:31:05 +01:00
Cedric Roux 73f3a458cf NSA: finalize nea2 security for gNB 
- a new section in the configuration file to select security algorithms,
  with new code to deal with it
- cleanup CG-ConfigInfo: specs seem to indicate that we must not
  add mcg_RB_Config; the gNB has to deal with that
- as a consequence, modify fill_default_rbconfig() that is called in
  every cases and needs security and bearer parameters

The new section in the configuration file looks like:

    security = {
      # preferred ciphering algorithms
      # the first one of the list that an UE supports in chosen
      # valid values: nea0, nea1, nea2, nea3
      ciphering_algorithms = ( "nea0", "nea2" );

      # preferred integrity algorithms
      # the first one of the list that an UE supports in chosen
      # valid values: nia0, nia1, nia2, nia3
      integrity_algorithms = ( "nia0" );
    };
 2021-02-15 15:25:52 +01:00
Cedric Roux cb589c211c minor trivial bugfix 2021-02-15 15:25:52 +01:00
Cedric Roux 10e021e96d NSA: first draft of nea2 security for gNB 
The code is forced to use nea2, no matter what the UE supports.

After 2^18 PDCP packets, it will fail to work (we don't use HFN yet).

These limitations will be fixed in later commits.

The existing security function was not reused, because it does too
much memory allocation and initializes the security context at each
ciphering. So here comes nr_pdcp_security_nea2_cipher(). And also
the ciphering is done inplace. To be changed if necessary.
 2021-02-15 15:25:47 +01:00
Mahesh eb19e02cf3 Merging MR978 with develop 2021-02-11 22:50:25 +05:30
Mahesh 0e6f1e6ad6 Merge conflicts resolved 2021-02-08 18:05:29 +05:30
Robert Schmidt d7f46a2ff2 Set RRC nrofHARQ_ProcessesForPDSCH to 16 2021-02-07 10:39:39 +01:00
hardy 5d832308c6 Merge remote-tracking branch 'origin/NR_SA_itti_sim_wk48' into integration_2021_wk05 2021-02-05 11:43:54 +01: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
hardy c00b44028b Merge remote-tracking branch 'origin/develop-sib1-update' into integration_2021_wk05 2021-02-02 15:40:22 +01:00
Mahesh ae422aca1f Merge conficts resolved 2021-02-02 09:36:49 +05:30
yoshio.inoue c49220610d add TODO comments 2021-02-01 21:19:04 +09:00
Cedric Roux 94dad700c4 lte/nr x2ap: fix content of SgNBAdditionRequest 
Wireshark (version 3.3.2) was not happy.
https://asn1.io/asn1playground/ was not happy.

Let's make them happy.

So then everyone is happy.
 2021-02-01 11:48:44 +01:00
Wu.Jing 37f0198944 Revert "remove the commented code from rrc_gNB.c" 
This reverts commit 15caed4d54.
 2021-02-01 16:02:47 +09:00
Wu.Jing c20fae1dea Merge branch 'develop_SA_SIM' into develop_SA_L3 2021-02-01 14:58:51 +09:00
He Shanyun 150221536c change output format for ran ue ngap id 2021-02-01 14:08:19 +09:00
Xue Song a85f261b54 add license text 
fix some problems
 2021-02-01 13:59:56 +09:00
yincong 15caed4d54 remove the commented code from rrc_gNB.c 2021-02-01 12:27:37 +09:00
hardy 6e12f8f8d3 Merge remote-tracking branch 'origin/nr_ul_scfdma' into integration_2021_wk04_b 2021-01-29 07:40:42 +01:00
hardy 9c810b311d Merge remote-tracking branch 'origin/itti-enhancement' into integration_2021_wk04_b 2021-01-29 07:40:07 +01:00
rmagueta 62bc47c820 Minor update in SIB1 contents. do_SIB1_NR() only if SA. 2021-01-28 16:04:41 +00: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
rmagueta 6e917c539f Fill SIB1 with more contents 2021-01-25 23:18:35 +00:00
Xue Song d9934436c3 fix some cppcheck errors 2021-01-25 14:26:39 +09:00
rmagueta 094f21a165 Fix REG to CCE mapping at UE 2021-01-23 18:40:30 +00:00
rmagueta 70938bb907 Fix REG to CCE mapping at gNB 2021-01-22 17:18:37 +00:00
Xue Song 84d3cfb12f fix some warnings 2021-01-22 18:24:28 +09:00
Xue Song 4c1e47405f update F1AP to R16.3.1 2021-01-21 14:56:22 +09:00
He Shanyun e4ff0d5b31 Merge remote-tracking branch 'remotes/origin/master' into develop_SA_L3 2021-01-20 01:51:32 +00: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
He Shanyun b425e6f495 fix cppcheck error and warning 2021-01-16 12:04:00 +09:00
Thomas Schlichter 691ad0bba0 Merge remote-tracking branch 'develop' into nr_ul_scfdma 
Conflicts:
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
 2021-01-15 14:54:37 +01:00
Mahesh 185fcbf7fe Merged latest commit(MR957) 2021-01-15 18:53:02 +05:30
Xue Song 01a87a1fba split gNB into CU and DU 2021-01-15 19:57:26 +09: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
Laurent 3b0c43c04b fix memory allocation error 2021-01-10 21:41:22 +01:00
rmagueta ab107c98dd Fix RA BWP at UE 2021-01-09 15:58:54 +00:00
rmagueta 223c8b9ad9 Fix REG mapping type for coreset0 2021-01-07 18:28:17 +00:00
Wu.Jing e2d26d2a44 Merge branch 'master' into develop_SA_F1 2021-01-07 13:56:32 +09:00
Wu.Jing f22a779881 Merge branch 'master' into develop_SA_L3 2021-01-07 13:55:40 +09:00
Laurent 42a110338c itti dynamic queue creation, and 64 bits instance id 2020-12-23 13:56:01 +01:00
Xue Song 1fcd879f97 modify F1 Setup Response 
add rrc_gNB_process_f1_setup_req
 2020-12-23 10:03:04 +00:00