maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,312 Commits 5 Branches 0 Tags
d4e3118375b797599f3d00a59535199e307e024a
Commit Graph
612 Commits
Author SHA1 Message Date
hardy dc4d243b6c Merge remote-tracking branch 'origin/develop-aw2sori' into integration_2021_wk47_b 2021-11-24 09:42:56 +01:00
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
frtabu c3c02bbd91 Use same port number for source and destination number in new gtp implementation. 2021-10-20 17:09:46 +02:00
frtabu 9707cb9910 rebase on develop 2021-10-20 17:09:46 +02:00
Masayuki Harada 80831cd48f Fix nr_derive_key memory problem. 2021-09-29 00:10:48 +09:00
Laurent OpenCells 754e8e3043 CMakeList cleanup,improvement and trial to run in ubuntu 16 2021-07-25 13:52:01 +02:00
Laurent OpenCells f62b7e1f9e nfapi work around (missing malloc) 2021-07-22 15:32:09 +02:00
Laurent OpenCells 78da843624 code-cleanup-20210716 2021-07-16 17:16:15 +02:00
Raymond Knopp 72751870cf Merge remote-tracking branch 'origin/develop' into develop-aw2sori 2021-07-14 12:02:29 +02:00
Raymond Knopp 0aaee3f031 added X2 Reset procedure (partially). Still to be added to top-level when gNB or eNB are stopped or crash (Assert) 2021-07-14 12:01: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
Laurent THOMAS aef67d0310 fix merge NR_SA_F1AP_5GRECORDS and fix warnings, a regression in UE (LCID lopp) 2021-06-21 21:01:59 +02:00
Laurent THOMAS a88c33b148 fix array overflow and wrong LCID 2021-06-21 12:56:57 +02:00
luis_pereira87 5406a4534d Release RNTI of LTE PHY when RA does not succeed 2021-06-02 16:29:45 +01:00
Roberto Louro Magueta 2e518d95fa Revert "Merge remote-tracking branch 'remotes/oai/develop-NR_SA_F1AP_5GRECORDS' into..." 
This reverts commit 4100dc3338
 2021-05-31 14:13:46 +02:00
rmagueta a205dcbf44 Fix GTP for LTE 2021-05-31 12:10:24 +01:00
Roberto Louro Magueta 1145a5516c Revert "Change hardcoded task id to TASK_VARIABLE" 
This reverts commit 64aa42d646
 2021-05-31 02:05:38 +02:00
rmagueta 64aa42d646 Change hardcoded task id to TASK_VARIABLE 2021-05-30 20:16:55 +01:00
luis_pereira87 55936d24bf Refactor some logs 2021-05-27 16:14:19 +01:00
Luis Pereira 4473ac7c00 Revert "Temporary commit #2 (to be reverted)" 
This reverts commit b17b688c58
 2021-05-27 17:05:44 +02:00
luis_pereira87 b17b688c58 Temporary commit #2 (to be reverted) 2021-05-27 07:53:05 +01:00
rmagueta 56c5a0b3c3 Fix SI_container index for LTE 2021-05-26 16:19:07 +01: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
rmagueta 0a3f128e27 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS 
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	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_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
#	openair2/RRC/LTE/rrc_eNB_GTPV1U.c
 2021-04-27 15:46:18 +01: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
rmagueta 8613aeb9e6 Fixes after merge 
- No warning in RRC
- Ethernet lib fix: correct include
- fixes Msg.4
- fixes conf: the UE cannot handle mixed slots
 2021-04-18 12:42:34 +02: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
rmagueta 2c907fb6e5 Fix minor issues of develop 2021-04-15 15:09:22 +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 86f1c69f26 Fix code review remarks, merge develop, revert some merge errors 2021-04-13 22:28:02 +02:00
Raymond Knopp 1236f4c389 Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS 
Conflicts:
	cmake_targets/build_oai
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
 2021-04-12 16:03:09 +02:00
Raymond Knopp f7f8935ce3 minor wqupdates after merge with develop 2021-04-10 23:28:34 +02:00
Laurent Thomas 307098da4a merge develop 2021-04-09 12:39:33 +02:00
Raymond Knopp 0b59ce4faf Merge remote-tracking branch 'origin/develop' into oairu 2021-04-07 15:50:46 +02:00
Laurent Thomas 89598e3bad Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into sanitize-v1 2021-04-06 12:11:29 +02:00
Laurent OpenCells 4511e70fac fix from ci results 2021-04-05 12:56:52 +02:00
Laurent OpenCells c0ef3e6f88 fix gcc reported issues 2021-04-03 23:37:58 +02:00
Cedric Roux 46c1aff489 fix: do NR only if at least one gNB is connected to the eNB 
We used to set 'does_nr' of an UE if we detect ENDC supported in the
UE capabilities.

Then we activate NR measurements if 'does_nr' is true.

The problem is that if the eNB is not connected to a gNB but the UE
reports some NR measurements (because a gNB is running somewhere near)
then the eNB will crash when starting the switch to NR.

A (quick) solution is to set 'does_nr' only if there is a gNB connected to
the eNB.

Maybe not the best solution. To be changed if needed.
 2021-03-31 16:39:30 +02:00
Raymond Knopp df05672a4c Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS 
Conflicts:
	openair2/GNB_APP/gnb_config.c
	openair2/GNB_APP/gnb_paramdef.h
	openair2/LAYER2/NR_MAC_UE/config_ue.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_nsa.c
 2021-03-30 04:48:51 +02:00
Laurent THOMAS 738728142f merge develop 2021-03-29 15:33:45 +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
Laurent THOMAS 818c9b2c88 first pass 2021-03-25 20:13:50 +01:00
Raymond Knopp f6d53094c4 added DUtoCURRCContainer IE in UL INITIAL RRC MESSAGE TRANSFER 
added generation of initial Master Cell Group Configuration for both CU/DU and monolithic gNB.

Tested until transmission of RRCSetupComplete from UE
 2021-03-23 21:52:57 +01:00
Raymond Knopp 94085a41cd Merge remote-tracking branch 'origin/develop' into oairu 2021-03-16 08:07:16 +01:00