hardy
4c2c7f92a5
Merge remote-tracking branch 'origin/code-cleanup-2021oct24' into integration_2021_wk45_b
2021-11-08 13:12:52 +01:00
hardy
cb9defc629
Merge remote-tracking branch 'origin/develop-NR_SA_nrUE_security_update' into integration_2021_wk44
2021-11-03 13:38:33 +01:00
Laurent THOMAS
e3f9fd6b01
code cleanup, no feature
2021-10-24 14:47:24 +02:00
Mario Joa-Ng
d483410e2a
Merge develop.
2021-10-20 21:06:16 -04:00
Masayuki Harada
f818307143
Remove warning.
2021-09-29 01:20:36 +09:00
Masayuki Harada
7cd75730d3
Remove ifndef PHYSIM conditions.
2021-09-29 01:02:22 +09:00
Masayuki Harada
80831cd48f
Fix nr_derive_key memory problem.
2021-09-29 00:10:48 +09:00
Masayuki Harada
2fb3816722
Fix NRUE NAS security configuration.
2021-09-28 20:26:48 +09:00
mjoang
626e3a7015
merge develop
2021-09-23 10:44:43 -04:00
Raymond Knopp
37b135b616
logging and DL-CCCH decoding size::
2021-09-11 13:58:08 +02:00
Masayuki Harada
edd179c263
Merge remote-tracking branch 'remotes/oai/nr-pdcp-security-w34' into develop-NR_SA_nrUE_security_update
2021-09-09 19:40:46 +09:00
rmagueta
71cd100335
Merge remote-tracking branch 'origin/nr-pdcp-security-w34' into bandwidth-testing-abs
...
# Conflicts:
# ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
# openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2021-09-08 17:22:28 +01:00
Masayuki Harada
d0575640fc
Add calc kgnb and PDCP security settings in nrUE.
2021-09-08 22:52:50 +09:00
Cedric Roux
eeca38368e
gnb sa: improve security
...
Note: some modifications have been done to the UE too, but for syntactic
reasons. The UE may fail to work, not tested.
For the UE, we have the problem of handling properly SecurityModeCommand.
We don't verify its integrity. This is a bit complicated to handle properly
and may require some API changes in the PDCP layer. So, as of today, the
integrity of this message is not verified.
Also, NSA mode has been touched, but it should not be a problem. But not
tested, so not sure.
2021-09-06 11:06:47 +02:00
rmagueta
a45eb42fca
Change log levels
2021-09-01 12:57:01 +01:00
Mario Joa-Ng
382086d151
NR_UE: set mac->logicalChannelBearer_exist to false when RLC bearer is released.
2021-08-24 14:28:23 -04:00
Mario Joa-Ng
1d33305a70
NR_UE: set mac->logicalChannelBearer_exist to false when RLC bearer is released.
2021-08-24 12:51:32 -04:00
mjoang
e8156ddba7
1. Move NR_LONG_BSR_TABLE and NR_SHORT_BSR_TABLE to nr_mac_common.c 2. Change nr_rlc_mac_config_req_ue_logicalChannelBearer to nr_rrc_mac_config_req_ue_logicalChannelBearer.
2021-08-23 15:38:52 -04:00
francescomani
1d66b5c415
attempting to fix wrong implementation in NSA UE configuration
2021-07-26 16:08:52 +02:00
francescomani
ef84130e7c
Merge remote-tracking branch 'origin/develop' into NR_UE_SA
2021-07-23 16:01:43 +02:00
rmagueta
f2b52ba3da
Revert some xer_fprints
2021-07-15 10:35:54 +01:00
rmagueta
a2450bb4b7
Protect some xer_fprints by an if
2021-07-14 15:30:07 +01:00
francescomani
2fe8dd7657
Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS-abs' into NR_UE_SA
2021-07-14 10:35:09 +02:00
rmagueta
160cb0b930
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS-lts2
...
# Conflicts:
# cmake_targets/CMakeLists.txt
# cmake_targets/build_oai
# cmake_targets/tools/build_helper
# executables/nr-gnb.c
# openair1/PHY/INIT/nr_init_ru.c
# openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
# openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
# openair1/SCHED_NR/phy_procedures_nr_gNB.c
# openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
# openair2/F1AP/f1ap_du_rrc_message_transfer.c
# openair2/F1AP/f1ap_du_rrc_message_transfer.h
# openair2/F1AP/f1ap_du_task.c
# openair2/GNB_APP/gnb_app.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
# openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
# openair2/RRC/LTE/rrc_eNB_GTPV1U.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/rrc_UE.c
# openair3/NAS/NR_UE/nr_nas_msg_sim.c
# openair3/ocp-gtpu/gtp_itf.cpp
# targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-06-30 17:00:30 +01:00
matzakos
408d05c682
Configure PDCP entity for UE DRB with no integrity and ciphering to comply with configuration at gNB
...
-To be revisited if we want to enable integrity and ciphering for DRBs
2021-06-27 10:34:37 +02:00
Laurent THOMAS
64e58a4300
dirty fixes that fix the UL malformed packets (detected in wireshark), and also internally memory corrpution
2021-06-23 21:41:56 +02:00
Laurent THOMAS
75e999572f
add DLinformationTransfer in nrUE, process SRB!=1 in UE (instead of discard), change struct member pdusession into pduSession to increase code readability (another struct contains also pdusession in lower case)
2021-06-22 14:26:25 +02:00
Laurent THOMAS
1b62c91532
add configurable USIM
2021-06-14 16:32:29 +02:00
rmagueta
e72a6798c1
Change some LOG levels
2021-06-05 14:20:39 +01:00
matzakos
01635a40f8
Enable DRB configuration for PDCP, RLC at OAI UE
2021-05-26 17:47:53 +02:00
francescomani
f84d6767c3
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into NR_UE_SA
2021-05-20 16:13:46 +02:00
rmagueta
8c5725ed46
Merge remote-tracking branch 'origin/fix-compile' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# cmake_targets/CMakeLists.txt
# openair2/RRC/NR_UE/rrc_UE.c
# openair2/SIMULATION/NR_RRC/itti_sim.c
2021-05-19 12:09:27 +01:00
rmagueta
cf605f4c77
Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# cmake_targets/CMakeLists.txt
# cmake_targets/build_oai
# openair1/PHY/INIT/nr_init_ru.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
# openair1/SCHED_NR/phy_procedures_nr_gNB.c
# openair1/SIMULATION/NR_PHY/ulsim.c
# openair2/COMMON/platform_constants.h
# openair2/ENB_APP/enb_config.c
# openair2/F1AP/f1ap_cu_interface_management.c
# openair2/F1AP/f1ap_cu_rrc_message_transfer.c
# openair2/F1AP/f1ap_cu_ue_context_management.c
# openair2/F1AP/f1ap_du_interface_management.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/RRC/LTE/rrc_eNB.c
# openair2/RRC/NR/rrc_gNB.c
# openair2/RRC/NR_UE/rrc_UE.c
2021-05-17 01:36:39 +01:00
Laurent THOMAS
b5bbfdade3
after merge, remain compile errors
2021-05-16 23:57:35 +02:00
rmagueta
0ef6ef2b28
Code format improvements in differences for develop
2021-05-12 19:29:10 +01:00
Laurent THOMAS
04b28b4518
fixes from testing
2021-04-30 16:47:40 +02:00
Raymond Knopp
d88ce5b9bf
Merge remote-tracking branch 'origin/develop' into oairu
2021-04-27 11:58:31 +02:00
Raymond Knopp
2be602e938
Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_5GRECORDS
2021-04-26 10:51:18 +02:00
francescomani
40eb1fb748
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into NR_UE_SA
2021-04-20 11:12:20 +02:00
luis_pereira87
2fb267145e
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-04-19 12:12:44 +01:00
Raymond Knopp
2b2285747d
OK up to RRCSetupComplete received in RRC and decoded correctly
2021-04-17 00:09:43 +02:00
Raymond Knopp
7818958da0
Validated up to reception of first PUSCH after Msg4 (contains RRCSetupComplete)
2021-04-16 15:30:50 +02:00
francescomani
6b82ac26fc
using common configuration complete to signal sib1 decoded
2021-04-16 08:52:31 +02:00
rmagueta
131cef2b6b
Fix build warnings
2021-04-15 22:59:35 +01:00
rmagueta
4301582f88
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/SIMULATION/NR_RRC/itti_sim.c
2021-04-15 15:29:03 +01:00
francescomani
a170257d62
fix for RA SS
2021-04-15 15:33:08 +02:00
francescomani
1051c94cf6
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into NR_UE_SA
2021-04-15 11:53:16 +02:00
hardy
b5ffe11bd8
Merge remote-tracking branch 'origin/develop-SA-CBRA' into integration_2020_wk15
...
Conflicts:
openair1/PHY/TOOLS/nr_phy_scope.c
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-04-14 15:14:03 +02:00
francescomani
0fac0ee70c
filling config request, adjustment of prach functions and remove hardcoding from sib1
2021-04-14 15:03:25 +02:00
matzakos
ea65e1899e
Add calls to initialization and configuration functions for RLC and PDCP at nrUE for SA mode
...
-RRCSetupComplete successfully transferred to RLC of the UE now through SRB1, but not at the MAC yet.
-Needed to enable some additional elements for RLC config. at the gNB side (asn1_msg.c) so that the addition of the SRB does not fail at the UE.
To verify if these are really required.
2021-04-14 10:20:33 +02:00