Commit Graph
102 Commits
Author SHA1 Message Date
cig 5cfa2cd2f4 Removed OAI exit in mac_rlc_data_req when no RB is present
- this prevents crashes when the function is called for LCIDs that have no RB
- and simply print error message and return 0 when no RB is found
2021-08-04 12:49:42 +02:00
rmagueta a2450bb4b7 Protect some xer_fprints by an if 2021-07-14 15:30:07 +01: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 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 aa9837395e force UE DRB no integrity 2021-06-23 09:46:53 +02: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
rmagueta ebede5c932 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2021-06-14 16:53:10 +01:00
rmagueta e72a6798c1 Change some LOG levels 2021-06-05 14:20:39 +01:00
matzakos 0f98a57162 Remove redundant hack to send RRCSetupRequest through DCCH in F1 (CU/DU) mode
-Instead RRCSetupRequest is sent from DU to CU through nr_mac_rrc_data_ind()->DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER() and then through F1AP to CU.
2021-06-02 20:57:45 +02:00
Eurecom ac4670990c handling for UL failure. added do_precoding flag to nr-ru procedures. testing with 2x2 N310. 2021-05-30 23:14:12 +02:00
Cedric Roux e257f76dd0 nr: rlc: minor: set log level to error for max retx reached
Just in case there is a problem, better to see it.

max retx reached means "radio link failure". We should do
something about it at some point. For the moment, let's
inform the user that there is a problem.

We can set back to LOG_D later in time when we deal with it
properly.
2021-05-18 10:30:26 +02:00
Eurecom 6e49488f74 Merge branch 'gnb-n300-fixes' into NR_SA_F1AP_5GRECORDS 2021-05-13 09:06:46 +02:00
rmagueta 0ef6ef2b28 Code format improvements in differences for develop 2021-05-12 19:29:10 +01:00
Raymond Knopp e2b68a99a9 CU/DU support for most recent changes. UE continues as far as in monolithic mode. Still to apply masterCellGroupConfig in DU from RRCReconfiguration. This has to be detected in DU and applied after decoding the RRC message intended for UE. 2021-05-09 12:44:55 +02:00
rmagueta 102a76fd56 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair2/GNB_APP/MACRLC_nr_paramdef.h
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/NR_PHY_INTERFACE/NR_IF_Module.c
2021-05-04 11:23:21 +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
Eurecom 35236c818f Merge branch 'NR_SA_F1AP_5GRECORDS' into gnb-n300-fixes
Conflicts:
	executables/nr-ru.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
2021-05-02 10:04:37 +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 ed0fedc1b6 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
2021-05-01 18:42:28 +01:00
Raymond Knopp ab0e14ce8d logging for debugging DRB/SRB2 establishment at gNodeB 2021-05-01 09:55:00 +02:00
Eurecom 518edc742c n300 fixes 50 MHz configuration 2021-04-29 13:07:20 +02:00
imad 27bfe23c9b Add schedulingRequestResourceConfig 2021-04-27 08:30:33 +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 cc727b4a89 Add SRB 2021-04-25 04:31:15 +01: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
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
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
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
Laurent Thomas 89598e3bad Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into sanitize-v1 2021-04-06 12:11:29 +02:00
hardy dac2388ed1 Merge remote-tracking branch 'origin/fix-nr-rlc-range-nack' into integration_2021_wk14_a 2021-04-04 08:18:25 +02:00
Laurent OpenCells c0ef3e6f88 fix gcc reported issues 2021-04-03 23:37:58 +02:00
Raymond Knopp 2913757461 Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
	executables/nr-softmodem.c
	executables/nr-ue.c
	openair2/GNB_APP/gnb_app.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2021-03-31 03:14:48 +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
Cedric Roux 9d1c24d461 nr rlc: bugfix: fix NACK with range
We do some sanity checks for incoming rlc control packets. One of them
is to check that so_start is not > so_end when present.

But when 'range' is present and bigger than 1 it means that so_start refers
to one PDU and so_end to another one. So we may well have so_start > so_end.

This commit fixes that and reorganizes a bit the code to do the check before
processing and rejecting the PDU if the values are not correct. (Before this
commit we were NACKing the whole PDUs if so_start > so_end.)
2021-03-26 15:36:43 +01:00
yoshio.inoue 81c92d226f Define variables according to coding conventions. 2021-03-09 18:14:39 +09:00
Wang He 264af1860f fix build error and core dump error. 2021-03-09 15:43:18 +09:00
masayuki.harada c9906d1a70 Merge remote-tracking branch 'remotes/oai/NR_SA_F1AP_RFSIMULATOR3' into NR_SA_F1AP_RFSIMULATOR3_Lo
# Conflicts:
#	openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
#	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2021-03-08 13:43:39 +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
wf d6763661be du-cu tested ok 2021-03-04 19:30:49 +08:00
wf 44d40219f2 modify fro comments, no warning now 2021-03-04 16:42:20 +08:00
matzakos 20805c1314 Remove confusing mixed SRB/DRB functions for SRB addition in RLC
- SRB addition is now done through add_srb, add_srb_am functions
2021-02-26 13:01:17 +01:00
matzakos e186134061 Preliminary work for separation of SRB from DRB handling in RLC
-For the moment SRBs are preconfigured (as was done for DRBs in noS1 mode)
but this should be removed
2021-02-26 12:11:01 +01:00
francescomani cb296fa050 Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO 2021-02-11 18:15:12 +01:00
yincong c416e545e2 fix problems about rfsim noS1 2021-02-09 19:01:34 +09:00
Cedric Roux 16b9f4ed60 Increase RLC buffer size to 10MB, warn when buffer full 2021-02-07 10:39:40 +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
francescomani 28cb2c6c77 Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO 2021-02-04 08:26:32 +01:00
Xue Song 84d3cfb12f fix some warnings 2021-01-22 18:24:28 +09:00
Xue Song 76cb132f2d u-plane is ok 2021-01-22 15:44:18 +09:00