Laurent THOMAS
66073d50fc
merge develop
2021-11-15 10:25:52 +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
Laurent THOMAS
9d1fe78e2e
merge develop, no working yet
2021-11-04 12:53:01 +01: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
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
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
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
Raphael Defosseux
11783e755a
Fixing errored/missing circular dependency protection
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-05-15 15:39:11 +02:00
laurent
756ac05e4d
merge develop,fix basic sim and warnings
2020-03-04 13:32:03 +01:00
frtabu
6014ca42ac
ENABLE_ITTI macro removal, modified telnet server to support all executables, modified record player to finalize switch to run-time option and allow usage with any device
2020-02-12 19:05:44 +01:00
laurent
8d9d80ee37
very big merge with merged develop, basic test done
2020-01-30 17:10:36 +01:00
Raphael Defosseux
c409da3bb8
Patch provided by Gabriel Arrobo.
...
Mainly comestics and integer type management
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-01-09 14:10:04 +01:00
yilmazt
4978102e2f
develop-nr merge
2019-12-23 15:20:00 +01:00
yilmazt
1b1648d504
develop-nr up-to-date
2019-12-17 18:23:10 +01:00
frtabu
69a7658c54
USRP device cleanup including record player as config option + some cppcheck warning/errors fixes
2019-12-16 17:53:22 +01:00
laurent
47abf562db
add FS6 transport time measurement
2019-12-06 16:24:47 +01:00
laurent
80cd6940af
modifications
2019-12-05 04:53:56 +01:00
laurent
e8091083b0
restore ue compilation with ocp-softmodem, some RF simulator improvement
2019-11-04 16:11:09 +01:00
yilmazt
cd098f3971
develop&-nr merge
2019-10-30 16:17:41 +01:00
laurent
0b7489b122
astyle only
2019-10-08 16:15:29 +02:00
laurent
445cf84e94
clean up wireshark traces
2019-10-08 16:04:10 +02:00
laurent
b7908ec25d
bug fixies
2019-10-08 14:27:39 +02:00
yilmazt
3a04f8f0ed
Merge branch 'develop-nr_cppcheck' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr_cppcheck
2019-10-07 12:05:26 +02:00
yilmazt
e5a9f02af6
develop-nr merge
2019-10-07 12:04:58 +02:00
Cedric Roux
1fe39ae262
remove compilation warning (may not be correct)
2019-10-07 10:09:28 +02:00
yilmazt
84af6103f8
another batch of cppcheck error corrections
2019-09-24 11:59:17 +02: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
yilmazt
4c49d5ab0d
Merge branch 'develop-nr-merge' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr-merge
2019-07-16 11:20:33 +02:00