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
e7a43fb394
fix 4G DL rb id
2021-05-11 22:26:50 +02:00
matzakos
64cb9407ba
Add support for Initial context setup request carrying PDU Session resource setup list
...
-Apply patch from Fujitsu
-Trigger dedicated RRC Reconfiguration with DRB and SRB2 configuration once the PDU session is established
-Validation of control plane sequence with OAI CN and Nokia SA Box
2021-05-11 22:19:55 +02:00
rmagueta
5919b891bb
Fix new cppcheck errors/warnings
2021-05-11 15:00:39 +01:00
Raymond Knopp
83ccc50f18
Merge remote-tracking branch 'origin/develop' into oairu
2021-05-10 00:39:55 +02:00
rmagueta
8e5ccb00fd
Replace AssertFatal by LOG_E when UDP bind socket fails
2021-05-05 14:18:37 +01:00
rmagueta
948df0e034
Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# executables/softmodem-common.h
# openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
# openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/prachsim.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
2021-05-03 19:50:30 +01:00
rmagueta
4b5cef595a
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch.c
# openair1/SIMULATION/NR_PHY/dlsim.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
# openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2021-05-03 18:44:54 +01:00
Laurent THOMAS
5036540281
add create tunnel trace
2021-05-03 11:32:47 +02:00
Laurent THOMAS
6882ea7a7b
functional new gtpu, to be tested
2021-05-02 16:06:45 +02:00
Raymond Knopp
85aab6e826
changes in gtpu interface for testing, small changes in L1 for PUSCH signal/noise measurements. SRB2 interfaces.
2021-05-02 09:50:40 +02:00
rmagueta
655c5481e3
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# executables/nr-uesoftmodem.h
# openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
# openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
# openair2/RRC/NR_UE/L2_interface_ue.c
2021-04-30 18:00:27 +01:00
Laurent THOMAS
04b28b4518
fixes from testing
2021-04-30 16:47:40 +02:00
rmagueta
edb790ab04
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
2021-04-27 12:36:31 +01:00
matzakos
52f8506b5c
Include PDU session type field in PDU Session Establishment Request NAS message
2021-04-27 13:30:02 +02:00
matzakos
ee3b913864
Small correction in NGAP UERadioCapabilityInfoIndication message
2021-04-27 13:28:03 +02:00
matzakos
20653cd31b
Modify configuration of NGAP and NAS messages to comply with OAI CN configuration according to Fujitsu patch
...
-Hardcodings to be removed later when the NAS extensions will be integrated for OAI UE
2021-04-27 13:26:06 +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
Raphael Defosseux
599f56272c
[DOCKER] adding entrypoint to LTE-UE image
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2021-04-16 10:42:39 +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
hardy
c4745c3e46
Merge remote-tracking branch 'origin/new-gtpu' into integration_2020_wk15
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/TOOLS/time_meas.h
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/LAYER2/RLC/rlc.h
2021-04-14 14:56:04 +02:00
Laurent Thomas
307098da4a
merge develop
2021-04-09 12:39:33 +02:00
Laurent OpenCells
c0ef3e6f88
fix gcc reported issues
2021-04-03 23:37:58 +02:00
Raymond Knopp
4d0d4fcb29
Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
...
Conflicts:
cmake_targets/CMakeLists.txt
openair2/LAYER2/NR_MAC_gNB/gNB_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_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h
openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
openair2/LAYER2/nr_pdcp/nr_pdcp_sdu.h
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR_UE/rrc_UE.c
2021-03-27 15:31:22 +01:00
Raymond Knopp
9dd6e3bb82
Merge remote-tracking branch 'origin/develop-SA-CBRA-CUDU' into NR_SA_F1AP_5GRECORDS
...
Conflicts:
executables/nr-uesoftmodem.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/RRC/NR/L2_nr_interface.c
2021-03-18 07:50:08 +01:00
Raymond Knopp
94085a41cd
Merge remote-tracking branch 'origin/develop' into oairu
2021-03-16 08:07:16 +01:00
He Shanyun
8965dd782b
Merge remote-tracking branch 'remotes/origin/develop_SA_CUDU_rfsim_with_5gc' into integration_w5GC
...
Conflicts:
cmake_targets/CMakeLists.txt
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2021-03-11 14:39:36 +09:00
masayuki.harada
535efa0fd2
Remove s1ap_eNB_timer.c and s1ap_eNB_timer.h
2021-03-10 23:16:12 +09:00
matzakos
906fd2b68f
Merge branch NR_SA_F1AP_RFSIMULATOR3 into NR_SA_F1AP_5GRECORDS
2021-03-09 15:24:11 +01:00
masayuki.harada
969425f6a8
Replace to itti timer.
...
Fix nnsf selection.
Fix indentation and opening brace.
2021-03-09 03:25:00 +09:00
masayuki.harada
ff994453a4
Merge remote-tracking branch 'remotes/oai/develop' into HEAD
...
# Conflicts:
# openair3/S1AP/s1ap_eNB.c
# openair3/S1AP/s1ap_eNB_handlers.c
2021-03-08 14:51:11 +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
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
Xue Song
5918c03cd4
add nrue nas task
2021-02-16 14:14:46 +09:00
Laurent Thomas
abfa103247
fix re-reading and end marker code
2021-02-15 10:54:35 +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
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
Laurent Thomas
fa63d9a4e6
merge develop
2021-02-08 11:56:42 +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
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
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
Raymond Knopp
4e9afb30b0
Merge remote-tracking branch 'origin/develop' into oairu
2021-02-02 12:09:56 +01:00
Laurent Thomas
7eda2b7409
remainign bug after merge develop
2021-02-01 15:35:17 +01:00
Laurent Thomas
6b37681854
merge develop, minor code addition
2021-02-01 09:02:57 +01:00
Xue Song
a85f261b54
add license text
...
fix some problems
2021-02-01 13:59:56 +09:00