Robert Schmidt
6c823168fe
Merge remote-tracking branch 'origin/episys-merge-nsa' into integration_2021_wk51_d
2021-12-24 10:13:27 +01:00
Laurent THOMAS
66073d50fc
merge develop
2021-11-15 10:25:52 +01:00
Melissa Elkadi
046258f1ba
Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa
2021-11-09 15:17:58 -08:00
Laurent THOMAS
e3f9fd6b01
code cleanup, no feature
2021-10-24 14:47:24 +02:00
Laurent THOMAS
a455ce7cab
fix F1-U bugs
2021-09-13 11:04:38 +02:00
Laurent THOMAS
7ca1f045d0
typo remaining
2021-08-31 14:36:56 +02:00
matzakos
4e667929b7
Add gtp-u tunnel creation at the CU side
...
- Change some elements names inside create_tunnel structure so that they are more generic to capture both N3 and F1-U use cases
2021-08-31 11:18:30 +02:00
Melissa Elkadi
9b16c1d860
Merge branch 'eurecom-develop' into episys/merge_nsa_w_develop
...
At this point we are successfully able to build.
Additionally, we can run the scenario,
however, it does not pass. It seems that the gNB
is not connecting to the proxy correctly. Just
wanted to push the progress so far. FYI, the items
that had to be changed to correct the linking issues
were the following:
- mac_rrc_data_ind_ue vs. nr_mac_rrc_data_ind_ue
- rrc_data_req vs. nr_rrc_data_req
- mac_rrc_data_req_ue vs. nr_mac_rrc_data_req_ue
- rrc_data_req_ue vs. rrc_data_req_nr_ue
- rrc_data_req vs. nr_rrc_data_req
The listed functions should be declard in the LTE/NR
UE directory depending on the functionality. Several
were mixed. i.e.: LTE functions being called in NR UE.
Also, removing siWindowLength, siWindowLength_int,
SIBType, SIBPeriod, and siPeriod_int from the NR UE RRC.
These variable were not used in the NR UE and are defined
for LTE only.
Lastly, in the NR_IF_Module.c of the NR UE, the global
variable def_dci_pdu_rel15 is not accessible. Need to
revisit this. For not it is commented out.
2021-08-11 10:23:42 -07:00
Laurent OpenCells
a03ee3548f
merge latest develop
2021-07-26 15:03:47 +02:00
Laurent THOMAS
bb6ded4258
Remove big race condition, remove name "callback" on what is not a callback
2021-07-13 13:40:28 +02:00
rmagueta
e72a6798c1
Change some LOG levels
2021-06-05 14:20:39 +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
Laurent THOMAS
b5bbfdade3
after merge, remain compile errors
2021-05-16 23:57:35 +02:00
Melissa Elkadi
dc2865f3ba
Added logs and updated eNB conf file for EPC if necessary
2021-05-13 15:13:59 -07:00
rmagueta
5919b891bb
Fix new cppcheck errors/warnings
2021-05-11 15:00:39 +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
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
Melissa Elkadi
e1a77b2d82
Add NSA mode to working dl_tti messages from gNB
...
This commit is not currently building, but I wanted
to be able to save the changes that I have added.
2021-04-30 13:36:18 -07:00
Raymond Knopp
2be602e938
Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_5GRECORDS
2021-04-26 10:51:18 +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
Michael Cook
092caec8ca
Merge branch 'episys-merge' into episys/trial-merge-to-master
2021-03-14 10:58:46 -04: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
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
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
Laurent Thomas
abfa103247
fix re-reading and end marker code
2021-02-15 10:54:35 +01: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
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
masayuki.harada
674339237f
Add handling of error case.
2021-01-06 20:20:22 +09:00
Laurent
42a110338c
itti dynamic queue creation, and 64 bits instance id
2020-12-23 13:56:01 +01:00
Wu.Jing
37d52bdf60
Merge branch 'develop_SA_SIM' into develop_SA_L3
...
Conflicts:
openair2/RRC/NR/nr_rrc_proto.h
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR_UE/rrc_UE.c
openair2/RRC/NR_UE/rrc_defs.h
openair3/NGAP/ngap_gNB_nas_procedures.c
2020-12-18 17:38:07 +09:00
He Shanyun
ec48bb8913
implement rrcReestablishmentComplete
2020-12-11 09:54:43 +09:00
Xue Song
6e2f63bf1f
Add rrc_gNB_process_NGAP_PDUSESSION_RELEASE_COMMAND and rrc_gNB_send_NGAP_PDUSESSION_RELEASE_RESPONSE
2020-11-25 18:55:59 +09:00
wu.jing
c994c2ad8f
Merge branch 'develop_SA_SIM' into develop_SA_L3
...
Conflicts:
common/utils/ocp_itti/intertask_interface.h
openair2/COMMON/gtpv1_u_messages_types.h
openair2/GNB_APP/gnb_config.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/nr_rrc_proto.h
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.h
openair3/NGAP/ngap_gNB_nas_procedures.c
2020-11-24 09:15:52 +00:00
yaojie
9d579b7a47
fix errors and warnings
2020-11-20 14:39:45 +09:00
Xue Song
e524cd9482
Add rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ
...
Add rrc_gNB_send_NGAP_PDUSESSION_SETUP_RESP
Fix some problems about pdu session setup
2020-11-17 19:03:55 +09:00
Cedric Roux
4236ff2b3e
nr: improve x2/rrc for ENDC
...
This commit introduces several enhancements in X2AP and RRC to deal
with ENDC. The main goal is to deal with UE's on/off and with various
errors.
The following work is included:
- DC prep and DC overall X2 timers
- X2 messages for UE release and DC timers' timeout
Open problems:
- what to do when the UE sends an scg Failure? This commit removes
the UE. And this removal may not be correctly done
- UE removal in the gNB's PHY layer (a next commit is coming,
but it is hackish and will need a rework)
2020-09-22 11:57:31 +02:00
Raphael Defosseux
4a873b4d43
CI: optmimizations on VM-based framework
...
also correction for Circular Dependency Protection on header files
also correction on the banner check
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-09-15 12:18:26 +02:00
Raphael Defosseux
1ff1f3dda9
fix a bunch of compilation warnings
2020-06-19 11:41:36 +02:00
Raymond Knopp
b6ce8ed962
ENDC S1-U gNB support: Separate some GTP functions between eNB and gNB. Downlink traffic from SGW arrives properly at gNB now after path switch
2020-04-10 12:15:52 +02:00
Raymond Knopp
1462f0e659
ENDC path switch S1-U: Bugfixes at gNB side
2020-03-20 22:55:17 +01:00
laurent
80cd6940af
modifications
2019-12-05 04:53:56 +01:00
frtabu
b9b4d05e41
remove RRC_VERSION macros, simplify build-oai and CMakefile.txt accordingly, get rid of remaining compilation warnings (opt module improperly merged and patch asn1c files with tests against max 64 bits integer value)
2019-09-23 19:46:44 +02:00
Raphael Defosseux
bfc3912f3e
Merge remote-tracking branch 'origin/loadtester_bugfixes' into develop_integration_2019_w30
2019-07-23 13:02:16 +02:00
wanghe
1f211efb12
Fix: GTP/S1AP UE resource release leak issue.
2019-07-16 19:50:28 +09:00