francescomani
1541a6b808
fix for ssb preamble index association in rrc configuration
2021-02-25 16:24:28 +01: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
francescomani
9afb19858a
Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO
2021-02-25 12:04:24 +01: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
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
Raymond Knopp
11c3a26414
Merge remote-tracking branch 'origin/develop' into oairu
...
Conflicts:
openair2/RRC/LTE/rrc_eNB.c
2021-02-24 21:52:14 +01:00
Melissa Elkadi
98c8ddb673
Merge remote-tracking branch 'origin/develop' into episys-merge
...
Removing references to memcpy_dl_config_req and
memcpy_tx_req because these functions are leaking
memory. For our standalone mode we have created
new/modified memcpy_dl/tx_req functions.
2021-02-24 11:49:17 -08: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
rmagueta
910154c7af
Merge branch 'develop' into develop-SA-RA
...
# Conflicts:
# cmake_targets/CMakeLists.txt
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/ulsim.c
2021-02-23 13:04:01 +00:00
Raymond Knopp
a6e16e7c8a
Merge remote-tracking branch 'origin/develop' into oairu
2021-02-23 11:51:29 +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
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
francescomani
ba02f61f28
Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS
2021-02-22 16:30:49 +01:00
Robert Schmidt
305902da42
Correctly allocate memory for NR measurement array
2021-02-20 15:43:02 +01:00
Melissa Elkadi
df2d3459d8
Set first random value to be UE number
...
Also added logs for debugging this rare random value issue.
2021-02-19 15:00:36 -08:00
rmagueta
edccb98691
First draft implementation of CBRA
2021-02-17 20:16:03 +00: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
Melissa Elkadi
17ede97029
Changed UE Capabilities log to a LOG_A
2021-02-15 15:27:25 -08: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
Laurent Thomas
abfa103247
fix re-reading and end marker code
2021-02-15 10:54:35 +01:00
Raymond Knopp
5ed79a27de
Merge remote-tracking branch 'origin/develop' into oairu
2021-02-14 07:18:13 +01:00
Raymond Knopp
a446eb0ebc
Merge branch 'episys/master' into episys-merge
...
Conflicts:
common/utils/LOG/log.h
common/utils/ocp_itti/intertask_interface.cpp
nfapi/oai_integration/nfapi_vnf.c
nfapi/open-nFAPI/nfapi/src/nfapi.c
openair2/LAYER2/MAC/main_ue.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/PHY_INTERFACE/phy_stub_UE.c
openair2/RRC/LTE/rrc_UE.c
openair2/RRC/LTE/rrc_eNB.c
openair3/NAS/UE/ESM/esm_ebr_context.c
targets/COMMON/openairinterface5g_limits.h
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-uesoftmodem.c
2021-02-13 22:52:33 +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
Thomas Schlichter
d2f353acf6
Merge remote-tracking branch 'develop' into NR_DL_MIMO
2021-02-12 15:33:51 +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
francescomani
cb296fa050
Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO
2021-02-11 18:15:12 +01:00
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
Parminder Singh
9202c583f5
Spaces are corrected, tabs replaced with spaces
2021-02-10 11:10:19 +01: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
Melissa
9fa09f530f
Updated non-blocking PDCP socket
...
More accurately, we changed the do/while infinite
loop to be an infinite for loop for the read command of
the socket. The socket file descriptor choice is more clear now.
2021-02-09 14:09:39 -08:00
luis_pereira87
5a1e2b1db7
Add support for SIB1 and SI in BCCH-DL-SCH
2021-02-09 15:32:17 +00:00
Thomas Schlichter
14e84f8782
Merge remote-tracking branch 'develop' into NR_DL_MIMO
2021-02-09 10:02:54 +01: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
Parminder Singh
222b37ff13
Merge remote-tracking branch 'origin/develop' into ptrs_rrc_config
2021-02-08 14:16:36 +01:00
Mahesh
0e6f1e6ad6
Merge conflicts resolved
2021-02-08 18:05:29 +05:30
francescomani
58ad2bf06f
Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO
2021-02-08 12:05:06 +01:00
Laurent Thomas
fa63d9a4e6
merge develop
2021-02-08 11:56:42 +01:00
Raymond Knopp
1bf9ea6d23
fixed NR build issues after merge with develop
2021-02-07 22:01:41 +01:00
Raymond Knopp
846c67b9bd
Merge remote-tracking branch 'origin/develop' into oairu
...
Conflicts:
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
2021-02-07 18:23:46 +01:00