Commit Graph
1748 Commits
Author SHA1 Message Date
luis_pereira87 f18db2bad8 Update SIB1 with q_RxLevMin to -65 and MCC and MNC to match SIM card values 2021-03-01 10:32:12 +00:00
rmagueta cf70265ba6 Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
2021-02-25 13:03:06 +00:00
rmagueta 48811d0f34 Merge branch 'develop' into develop-SA-CBRA
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
2021-02-23 13:29:53 +00:00
hardy accae67113 Merge remote-tracking branch 'origin/nr-pdcp-nea2-security' into integration_2021_wk08 2021-02-23 09:31:05 +01:00
rmagueta 495ba8920d Merge branch 'develop-SA-RA' into develop-SA-CBRA 2021-02-22 16:35:06 +00:00
rmagueta bed43a2a79 Address review comments 2021-02-22 16:31:13 +00:00
rmagueta 4ea560f291 Address review comments 2021-02-22 16:01:05 +00:00
rmagueta edccb98691 First draft implementation of CBRA 2021-02-17 20:16:03 +00: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
Cedric Roux 0b4335accc NSA: some work on security (for PDCP)
- compute correct kgNB
- propagate properly NR security capabilities of an UE
  (involves: rrc, s1ap, x2ap)
2021-02-12 16:01:37 +01:00
luis_pereira87 9a55e64e54 Fix build errors in physical unitary tests simulators, minor update in the documentation 2021-02-12 12:28:17 +00:00
Mahesh f69af6abaf merge MR978 (5G nFAPI) into develop 2021-02-12 16:26:22 +05:30
rmagueta 7011b04b75 Code clean up and minor correction in RA for SA 2021-02-12 00:24:31 +00:00
Mahesh eb19e02cf3 Merging MR978 with develop 2021-02-11 22:50:25 +05:30
rmagueta c5ab33ffd9 Merge remote-tracking branch 'origin/develop' into develop-SA-RA
# Conflicts:
#	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-02-11 12:27:06 +00:00
luis_pereira87 f4b3a869a6 minor fix at SIB1 decoding 2021-02-10 13:07:04 +00:00
luis_pereira87 5a1e2b1db7 Add support for SIB1 and SI in BCCH-DL-SCH 2021-02-09 15:32:17 +00:00
rmagueta 5b7ae1228f Fix develop merge conflicts 2021-02-08 19:18:00 +00:00
rmagueta 03b52cec84 Merge remote-tracking branch 'origin/develop' into develop-SA-RA
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/LAYER2/NR_MAC_UE/rar_tools_nrUE.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/RRC/NR_UE/rrc_UE.c
2021-02-08 15:17:12 +00:00
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 663dd1251c Merge remote-tracking branch 'origin/NR_RA_cleanup' into integration_2021_wk05 2021-02-05 12:00:38 +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 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
rmagueta c4ccc66169 Log SIB1 decoded 2021-02-02 18:12:11 +00:00
rmagueta f7649fb472 Merge remote-tracking branch 'origin/develop-sib1-update-ue' into develop-SA-RA
# Conflicts:
#	openair2/RRC/NR_UE/rrc_UE.c
2021-02-02 17:57:55 +00:00
rmagueta 9b24e1fbfa Merge branch 'develop' into develop-SA-RA 2021-02-02 17:40:22 +00:00
rmagueta 1717c1c6ab PDCCH add support for search space candidate_idx > 0 2021-02-02 14:48:18 +00:00
hardy c00b44028b Merge remote-tracking branch 'origin/develop-sib1-update' into integration_2021_wk05 2021-02-02 15:40:22 +01:00
rmagueta 76b974508b Merge branch 'develop' into develop-sib1-update-ue
# Conflicts:
#	cmake_targets/CMakeLists.txt
2021-02-02 12:10:12 +00: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
Thomas Schlichter bca9f74e66 Merge remote-tracking branch 'develop' into NR_RA_cleanup 2021-01-29 18:52:37 +01:00
hardy 5db5657df7 Merge remote-tracking branch 'origin/lte_uplink_improvement' into integration_2021_wk04_b 2021-01-29 07:41:47 +01: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 36487515c4 fix double definition in rrc_gNB_NGAP.c and nr_ngap_gnb.c 2021-01-28 14:20:35 +09:00
rmagueta 6e917c539f Fill SIB1 with more contents 2021-01-25 23:18:35 +00: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
rmagueta 9e9a032f6b Fix in the msg3 transmission for the RA 2021-01-21 20:10:23 +00:00