francescomani
08d2c9fb74
Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS
2021-03-12 15:54:13 +01:00
Remi Hardy
de9c8634ad
Merge remote-tracking branch 'origin/s1_subnormal' into integration_2021_wk10
2021-03-12 11:08:09 +01:00
He Shanyun
44288d7553
fix issue about ittiSIM and CplaneNG of withS1
2021-03-11 16:54:38 +09:00
Shweta Shrivastava
95df7843f3
Fix issues with NSA mode
2021-03-11 00:11:16 -06: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
Shweta Shrivastava
a0fa146e04
Merge branch 'ptrs_rrc_config' of https://gitlab.eurecom.fr/oai/openairinterface5g into ptrs_rrc_config
2021-03-10 22:58:06 -06:00
Shweta Shrivastava
7eec3e3bcc
Merge branch 'develop' into ptrs_rrc_config
2021-03-10 22:37:44 -06:00
Cedric Roux
4ff8f8832e
NR: fix: set PDCP discard timer to infinity
...
The discard timer is used by the PDCP layer to discard packets that were not
transmitted to RLC after some time.
We don't really need it for the moment, maybe never for the default
bearer which is a best-effort bearer passing all kind of IP traffic.
Maybe for voice over IP kind of traffic it's important, or realtime
applications.
I ran an iperf UDP uplink test and saw no error on the PHY layer but still
lots of packets lost in the iperf logs, which was very surprising. By
analyzing the logs in wireshark I saw that, with the current scheduler,
an IP packet sent by the UE took 40ms to be sent piece by piece to the
gNB, and then the next uplink IP packet was never sent at all because
the discard timer was expired, leading to the high count of packets lost
in the iperf logs.
So let's put infinity for the moment for the discard timer. From my
understanding of the moment it's not a problem. If for some reason we
should set it to some non-infinity value, then we can change later.
2021-03-10 10:30:23 +01:00
matzakos
906fd2b68f
Merge branch NR_SA_F1AP_RFSIMULATOR3 into NR_SA_F1AP_5GRECORDS
2021-03-09 15:24:11 +01:00
Raymond Knopp
666aee7fc2
addition of GNB-CU-Configuration-Update/Update-Acknowledge/Update-Failure
2021-03-08 10:57:00 +01: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
c273a9d356
fix problem about CU/DU c-plane failed
2021-03-05 19:43:42 +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
rmagueta
245f1e066f
Improvements in RA-Msg4
2021-03-04 01:23:56 +00:00
luis_pereira87
d0b9146cd0
Msg4 transmitted from MAC to RRC through ITTI (TASK_RRC_NRUE created)
2021-03-03 01:27:50 +00:00
rmagueta
abb894be6b
Draft RA-Msg4 at gNB
2021-03-02 20:20:11 +00:00
rmagueta
5f66269a8b
Merge remote-tracking branch 'origin/develop' into develop-SA-RA
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-03-02 12:01:11 +00:00
luis_pereira87
ca5eb17f28
Fix SIB1 with offsetToPointA = 86
2021-03-01 22:18:51 +00:00
rmagueta
deef82d70b
Fix RA-Msg3 to logical channel CCCH
2021-03-01 19:23:23 +00:00
luis_pereira87
f18db2bad8
Update SIB1 with q_RxLevMin to -65 and MCC and MNC to match SIM card values
2021-03-01 10:32:12 +00:00
Guhan
02ae169250
Rebased to latest develop and removed nr_rx_acknack function
2021-03-01 11:43:30 +05:30
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
guhan
5d4f815181
Removed dead code
2021-02-26 11:50:13 +05:30
k.ramya
0a0a5e48c3
code rearrangement
2021-02-26 11:37:58 +05:30
Francesco Mani
17f830e587
revert to old rrc csi confriguration
2021-02-26 11:29:28 +05:30
r.karey
8c488bfdf8
UCI bitlength calculation
2021-02-26 10:51:42 +05:30
r.karey
03ea28df44
Merged rrc_gNB_reconfig for NR_CSI_reporting
2021-02-26 10:48:37 +05:30
r.karey
21c0af1b7c
Merged rrc_gNB_reconfig for NR_CSI_reporting
2021-02-26 10:20:51 +05:30
francescomani
1541a6b808
fix for ssb preamble index association in rrc configuration
2021-02-25 16:24:28 +01:00
rmagueta
cf70265ba6
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/LAYER2/NR_MAC_gNB/mac_proto.h
2021-02-25 13:03:06 +00:00
francescomani
9afb19858a
Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO
2021-02-25 12:04:24 +01: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
Raymond Knopp
32b74d2f38
nr-softmodem compilation after merge with develop
2021-02-25 01:00:34 +01:00
Raymond Knopp
4d9ebf0ac0
Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_RFSIMULATOR2
...
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_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.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/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR_UE/rrc_UE.c
openair3/NGAP/ngap_gNB.c
openair3/NGAP/ngap_gNB_nas_procedures.c
2021-02-24 23:00:04 +01: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
rmagueta
48811d0f34
Merge branch 'develop' into develop-SA-CBRA
...
# Conflicts:
# cmake_targets/CMakeLists.txt
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/ulsim.c
2021-02-23 13:29:53 +00:00
rmagueta
910154c7af
Merge branch 'develop' into develop-SA-RA
...
# Conflicts:
# cmake_targets/CMakeLists.txt
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/ulsim.c
2021-02-23 13:04:01 +00:00
Raymond Knopp
a6e16e7c8a
Merge remote-tracking branch 'origin/develop' into oairu
2021-02-23 11:51:29 +01:00
hardy
accae67113
Merge remote-tracking branch 'origin/nr-pdcp-nea2-security' into integration_2021_wk08
2021-02-23 09:31:05 +01:00
rmagueta
495ba8920d
Merge branch 'develop-SA-RA' into develop-SA-CBRA
2021-02-22 16:35:06 +00:00
rmagueta
bed43a2a79
Address review comments
2021-02-22 16:31:13 +00:00
rmagueta
4ea560f291
Address review comments
2021-02-22 16:01:05 +00:00
francescomani
ba02f61f28
Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS
2021-02-22 16:30:49 +01:00
Robert Schmidt
305902da42
Correctly allocate memory for NR measurement array
2021-02-20 15:43:02 +01:00
rmagueta
edccb98691
First draft implementation of CBRA
2021-02-17 20:16:03 +00:00
Xue Song
bd765c7505
C-plane for rfsim with Free5GC + CU/DU separation is OK
2021-02-16 14:14:55 +09:00
Xue Song
5918c03cd4
add nrue nas task
2021-02-16 14:14:46 +09:00
Cedric Roux
73f3a458cf
NSA: finalize nea2 security for gNB
...
- a new section in the configuration file to select security algorithms,
with new code to deal with it
- cleanup CG-ConfigInfo: specs seem to indicate that we must not
add mcg_RB_Config; the gNB has to deal with that
- as a consequence, modify fill_default_rbconfig() that is called in
every cases and needs security and bearer parameters
The new section in the configuration file looks like:
security = {
# preferred ciphering algorithms
# the first one of the list that an UE supports in chosen
# valid values: nea0, nea1, nea2, nea3
ciphering_algorithms = ( "nea0", "nea2" );
# preferred integrity algorithms
# the first one of the list that an UE supports in chosen
# valid values: nia0, nia1, nia2, nia3
integrity_algorithms = ( "nia0" );
};
2021-02-15 15:25:52 +01:00
Cedric Roux
cb589c211c
minor trivial bugfix
2021-02-15 15:25:52 +01:00
Cedric Roux
10e021e96d
NSA: first draft of nea2 security for gNB
...
The code is forced to use nea2, no matter what the UE supports.
After 2^18 PDCP packets, it will fail to work (we don't use HFN yet).
These limitations will be fixed in later commits.
The existing security function was not reused, because it does too
much memory allocation and initializes the security context at each
ciphering. So here comes nr_pdcp_security_nea2_cipher(). And also
the ciphering is done inplace. To be changed if necessary.
2021-02-15 15:25:47 +01:00