matzakos
3aec9a43ea
Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS
2021-03-09 17:47:39 +01:00
Raymond Knopp
b192ce7ca0
removed assertions on non-presense of extensions for Cells_to_be_Activated_List_Item in both F1-Setup-Response and GNB-CU-Confiruation-Update
2021-03-09 16:01:41 +01:00
matzakos
3801c55f0f
Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS
2021-03-09 15:25: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
aaa7a3411b
removed assertion on nRPCI being null, it is not mandatory.
2021-03-09 14:50:34 +01:00
Raymond Knopp
3700759aa2
fixed byte-endian of fiveGS-TAC IE in F1AP.
2021-03-09 12:32:22 +01:00
yoshio.inoue
81c92d226f
Define variables according to coding conventions.
2021-03-09 18:14:39 +09:00
Raymond Knopp
1c8618efb9
fixed bug with fiveGS_TAC IE and added RRC_Version IE in F1-Setup-Req
2021-03-09 08:34:51 +01:00
Wang He
264af1860f
fix build error and core dump error.
2021-03-09 15:43:18 +09:00
Raymond Knopp
666aee7fc2
addition of GNB-CU-Configuration-Update/Update-Acknowledge/Update-Failure
2021-03-08 10:57:00 +01: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
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
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
4d685a0036
Proper separation of handling DCCH SRB1 and DTCH LCIDs at MAC gNB
...
-Remove redundant calls to mac_rlc_data_ind for DTCH case
2021-03-02 20:15:46 +01:00
hardy
8d05695722
Merge remote-tracking branch 'origin/benetel_driver_update' into integration_2021_wk09_b
2021-02-26 16:09:05 +01: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
Raymond Knopp
14379074a7
added TDD configuration information to F1-Setup-Request based on the configuration file contents.. Corrected some bugs in F1AP encoding for TDD.
2021-02-25 23:44:29 +01:00
Raymond Knopp
6b5a47081f
filling in some missing information in F1-Setup-Request
2021-02-25 11:54:38 +01: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
hardy
88ce69608c
Merge remote-tracking branch 'origin/NR_MAC_Multi_Rach_GlobalEdge' into integration_2021_wk08
2021-02-23 10:29:50 +01:00
hardy
30bede544c
Merge remote-tracking branch 'origin/nr-bsr-fix' into integration_2021_wk08
2021-02-23 09:31:22 +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
hardy
3199b81584
Merge remote-tracking branch 'origin/enhance-rfsim' into integration_2021_wk08
2021-02-23 09:30:42 +01:00
hardy
90d6a57a3c
Merge remote-tracking branch 'origin/NR_UL_SCFDMA_100MHz' into integration_2021_wk08
2021-02-23 09:30:22 +01:00
Florian Kaltenberger
a51e3defa8
when PRACH config 4 is used (Benetel RRU) we only schedule UL slots 8 and 9
2021-02-19 11:15:59 +01:00
Florian Kaltenberger
670c807a56
Merge remote-tracking branch 'origin/develop' into benetel_driver_update
2021-02-19 11:46:41 +01:00
guhan
e893ee8a16
Fixed the issue w.r.t looping of configured preamble list
2021-02-19 11:47:55 +05:30
Francesco Mani
80cac226fc
fixed a warning in gNB_scheduler_ulsch.c
2021-02-18 08:50:45 +01:00
Robert Schmidt
a3b1216b23
Fixup sched_ul_bytes logic
...
1) Only count new transmission as scheduled bytes (which is then
compared against the BSR)
2) When subtracting scheduled bytes after successful reception, subtract
TBsize from correct HARQ process
2021-02-17 10:17:59 +01:00
Cedric Roux
21ff70e84f
hack: put back a hack that seems necessary for NR rfsim tests in the CI
...
go figure...
2021-02-15 15:25:52 +01: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
Robert Schmidt
ef90d77b0e
Reformat nr_initiate_ra_proc() [no other changes]
2021-02-12 20:53:36 +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
guhan
0d5f1dfea0
Fixed the index issue
2021-02-12 19:49:42 +05:30
Mahesh
f69af6abaf
merge MR978 (5G nFAPI) into develop
2021-02-12 16:26:22 +05:30
kn.raju
37d112f511
Check that resources are free for Msg2/RAR
2021-02-12 08:31:35 +01:00
kn.raju
13e719d74a
fixes nr_initiate_ra_proc()
2021-02-12 08:31:30 +01:00
kn.raju
bf81ea19d3
Check cfra in nr_initiate_ra_proc()
2021-02-12 08:31:28 +01:00
kn.raju
66ffa08a3d
Handle individual RAs in nr_generate_Msg2() and nr_add_msg3()
...
* add the RA process to handle to command parameters
* Do not create the RAR_pdu into an intermediate array, but directly
into the nFAPI TX_req
* Slightly restructure nr_generate_Msg2() to first make AssertFatal()
checks, then proceed allocating
2021-02-12 08:31:26 +01:00
kn.raju
25a520e4fa
find_SSB_and_RO_available()
2021-02-12 08:31:23 +01:00
kn.raju
68b4a6bf28
Fixing association period
2021-02-12 08:31:17 +01:00
kn.raju
054934c4f8
Do nr_schedule_RA() for all RA processes
2021-02-12 08:31:13 +01:00
kn.raju
baba8d69be
nr_initiate_ra_proc(): check in all RA processes, check beam_index
2021-02-12 08:31:11 +01:00
kn.raju
4dacea921c
New UE: check for free RA and copy preamble list
2021-02-12 08:31:07 +01:00