Robert Schmidt
9714877ee0
Merge remote-tracking branch 'origin/remove-NR_UE_PBCH' into integration_2022_wk10
2022-03-07 23:12:49 +01:00
Robert Schmidt
e285b003dc
Merge remote-tracking branch 'origin/isolate-lfds' into integration_2022_wk10
2022-03-07 23:11:55 +01:00
Laurent Thomas
4c62aef755
rebase on develop
2022-03-02 11:26:16 +01:00
Laurent Thomas
c8abd3c0bf
remove lfds v6, lfds v7 for flexran only
2022-02-28 20:47:27 +01:00
Robert Schmidt
76d609f7fa
Delete unused code
2022-02-25 17:27:02 +01:00
Robert Schmidt
21f862641c
Merge remote-tracking branch 'origin/cleanup-20220125' into integration_2022_wk08
2022-02-19 19:34:01 +01:00
Laurent THOMAS
8e3f720b7d
fix unaligned mem for SIMD
2022-02-18 09:41:18 +01:00
Laurent THOMAS
3e7c22e7c6
gtp-u old code delete
2022-01-26 11:27:02 +01:00
luis_pereira87
978b4a1728
Merge remote-tracking branch 'origin/develop' into bler_txoptim
...
# Conflicts:
# openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c
2022-01-18 17:44:30 +00:00
Laurent THOMAS
d751568689
fix a bug in call to realloc inside a function
2022-01-12 16:12:36 +01:00
luis_pereira87
015e360d42
Merge remote-tracking branch 'origin/develop' into bler_txoptim
...
# Conflicts:
# ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
# ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
# openair1/SCHED_NR/fapi_nr_l1.c
2022-01-10 14:03:55 +00:00
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
rmagueta
70d3c7973c
Merge remote-tracking branch 'origin/develop' into bler_txoptim
2021-11-09 10:39:49 +00:00
hardy
4c2c7f92a5
Merge remote-tracking branch 'origin/code-cleanup-2021oct24' into integration_2021_wk45_b
2021-11-08 13:12:52 +01:00
Laurent THOMAS
9d1fe78e2e
merge develop, no working yet
2021-11-04 12:53:01 +01:00
luis_pereira87
29eca46833
Merge remote-tracking branch 'origin/develop' into bler_txoptim
...
# Conflicts:
# openair1/PHY/NR_TRANSPORT/pucch_rx.c
# openair2/GNB_APP/gnb_config.c
2021-11-04 11:32:03 +00:00
Melissa Elkadi
e8f965d010
Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa
2021-11-03 06:32:38 -07:00
luis_pereira87
cd2f704163
Fix segmentation fault when exporting packets to wireshark with high MCS
2021-11-02 17:24:10 +00:00
Laurent THOMAS
e3f9fd6b01
code cleanup, no feature
2021-10-24 14:47:24 +02:00
Masayuki Harada
80831cd48f
Fix nr_derive_key memory problem.
2021-09-29 00:10:48 +09:00
Laurent THOMAS
af19655763
Compile all targets to fix compilation regression
2021-09-14 09:37:06 +02:00
Melissa Elkadi
2a979f4e2f
Merge branch 'eurecom-nfapi-nr-arch-mod' into episys/merge_nsa_w_develop
2021-08-13 10:27:30 -07: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
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
Laurent THOMAS
bc528d0c73
fix wireshark interface headers
2021-07-12 13:22:38 +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
Luis Pereira
54666a932c
Revert "Skip PDCP integrity verification"
...
This reverts commit cc71b3f88a
2021-06-07 10:24:33 +02:00
luis_pereira87
cc71b3f88a
Skip PDCP integrity verification
2021-06-03 19:09:48 +01:00
Laurent THOMAS
9130197657
add wireshark header files
2021-05-19 10:26:26 +02:00
Laurent THOMAS
16d9d33d04
Fix minor bugs and wrong reported trace
2021-05-19 09:58:48 +02:00
Raymond Knopp
d88ce5b9bf
Merge remote-tracking branch 'origin/develop' into oairu
2021-04-27 11:58:31 +02:00
Raymond Knopp
0b59ce4faf
Merge remote-tracking branch 'origin/develop' into oairu
2021-04-07 15:50:46 +02:00
Laurent OpenCells
4511e70fac
fix from ci results
2021-04-05 12:56:52 +02:00
Laurent THOMAS
0317d6725b
sanitize, calibration tool kickoff
2021-04-02 10:12:13 +02:00
Cedric Roux
18cb68ecc2
nr pdcp: first draft of NIA2 integrity
...
This code has not been tested with a COTS UE. We need SRB1/2 (so we need SA)
to test.
The activation of security and integrity for SRB1 will need more code
(new functions) because it happens after some time, not at creation time
of the PDCP entity and there is no way to do this with current code.
2021-03-30 11:57:51 +02:00
Michael Cook
092caec8ca
Merge branch 'episys-merge' into episys/trial-merge-to-master
2021-03-14 10:58:46 -04: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
Raymond Knopp
d77f9ad096
build oairu ok
2021-02-15 08:13:15 +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
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
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
Xue Song
598eeb79d4
Derive keys from kgnb
2020-11-24 11:58:33 +09:00
laurent
6b50cbcae2
continue 5G SA
2020-10-01 16:13:03 +02:00
laurent
ffd4c20e58
fix L2 tracing in wireshark, start security mode comman
2020-09-24 11:55:43 +02:00
Raphael Defosseux
768b4e0f24
Merge remote-tracking branch 'origin/cleanup-may-2020' into develop_integration_2020_w22
2020-05-28 12:58:42 +02:00
laurent
bdee45878a
cleanup branch
2020-05-20 15:44:20 +02:00