Commit Graph
196 Commits
Author SHA1 Message Date
hardy accae67113 Merge remote-tracking branch 'origin/nr-pdcp-nea2-security' into integration_2021_wk08 2021-02-23 09:31:05 +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
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
Mahesh eb19e02cf3 Merging MR978 with develop 2021-02-11 22:50:25 +05:30
dir d2aa132616 Msg3_transformprecoder value initialised to TRANSFORM PRECODING DISABLED 2021-02-09 15:16:40 +02:00
Sakthivel Velumani 8902902706 Merge branch 'develop' into ue-fixes 2021-02-08 15:06:17 +01:00
Mahesh 0e6f1e6ad6 Merge conflicts resolved 2021-02-08 18:05:29 +05:30
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
Mahesh ae422aca1f Merge conficts resolved 2021-02-02 09:36:49 +05:30
Sakthivel Velumani c9dcff3d7e Merge branch 'develop' into ue-fixes 2021-02-01 16:07:58 +01:00
Sakthivel Velumani a241df5006 Fixed compile warnings 2021-01-31 17:35:08 +01:00
Sakthivel Velumani 0eb2e06725 Moved pusch thread parameter to L1 in config file 2021-01-29 13:14:14 +01:00
hardy 9c810b311d Merge remote-tracking branch 'origin/itti-enhancement' into integration_2021_wk04_b 2021-01-29 07:40:07 +01:00
He Shanyun e4ff0d5b31 Merge remote-tracking branch 'remotes/origin/master' into develop_SA_L3 2021-01-20 01:51:32 +00:00
Mahesh 185fcbf7fe Merged latest commit(MR957) 2021-01-15 18:53:02 +05:30
Laurent 42a110338c itti dynamic queue creation, and 64 bits instance id 2020-12-23 13:56:01 +01:00
Mahesh 024849983a Merge develop(w51 2) to nfapi_nr
Setting of nFAPI mode in NR yet to be updated
2020-12-18 23:26:21 +05:30
Wu.Jing 19118c13d1 Merge branch 'master' into develop_SA_L3 2020-12-18 11:52:59 +09:00
rmagueta 06cb91d795 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1
 Conflicts:
	openair2/LAYER2/NR_MAC_UE/mac_defs.h
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2020-12-10 16:24:28 +00:00
Remi Hardy 3d8be663a0 Merge remote-tracking branch 'origin/NR_FR2_RRC_SSB' into rh_wk50_debug
Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2020-12-09 13:16:41 +01:00
Remi Hardy 4a66c750ec Merge remote-tracking branch 'origin/pusch-mthread-scaling-fix' into rh_wk50_debug 2020-12-09 09:49:48 +01:00
Sakthivel Velumani e5cd573ecb Added a local variable instead of global 2020-12-04 15:10:58 +01:00
rmagueta 104b8ab21a Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1 2020-12-02 16:28:38 +00:00
Mahesh e174ebdc30 Resolved merge conflicts with nfapi_nr_develop 2020-12-02 16:28:18 +05:30
rmagueta 46de16b6e1 Minor updates in LOGs 2020-11-30 12:26:12 +00:00
hardy 279a721d23 Merge remote-tracking branch 'origin/remove_x2_gnb_hardcoding' into integration_2020_wk49 2020-11-30 10:34:52 +01:00
Francesco Mani 8a9e242856 Merge remote-tracking branch 'origin/develop' into NR_FR2_RRC_SSB 2020-11-27 11:33:52 +01:00
rmagueta 81d64b3dec Minor corrections 2020-11-26 03:12:59 +00:00
rmagueta 1d8a61f9e5 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1
 Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
	openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair2/RRC/NR/L2_nr_interface.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair2/RRC/NR_UE/rrc_defs.h
2020-11-25 18:17:39 +00:00
Sakthivel Velumani f9c3ff3ca3 Updated the config files 2020-11-25 11:12:32 +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
Mahesh 87105d77cf Merged latest develop to nfapi 2020-11-19 22:33:39 +05:30
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
matzakos f26f096f5e Remove redundant debugging logs 2020-11-16 15:19:39 +01:00
matzakos 648ef92ac7 Remove hardcoding of x2 configuration parameters used in ENDC setup request message at gNB side 2020-11-16 15:19:39 +01:00
Francesco Mani 471c8eb8e1 bugfix for long ssb bitmap in fix scc 2020-11-12 10:20:49 +01:00
Mahesh e6bf90e2dd LTE and NR NFAPI integration 2020-11-11 15:10:32 +05:30
Francesco Mani b1bffcee81 extend bitmap for SSB in RRC to FR2 2020-11-10 19:03:29 +01:00
Xue Song 9bba3c795a Fix GTPU's IP setting error 2020-11-09 18:04:56 +09:00
Xue Song 04897ab64f Fix GTPU's IP setting error 2020-11-09 08:32:57 +00:00
rmagueta 45911fb8f0 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1
 Conflicts:
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2020-11-03 19:41:52 +00:00
rmagueta 6e0b0049ea Coreset0 frequency allocation update 2020-11-03 18:58:56 +00:00
masayuki.harada 483f4b2d1b Fix merge miss. 2020-10-28 04:21:41 +09:00
masayuki.harada dc288b7bc8 Merge branch 'develop_SA_L3' into NR_SA_NGAP_RRC_wk42
# Conflicts:
#	openair2/GNB_APP/gnb_paramdef.h
#	openair2/RRC/NR/rrc_gNB.c
2020-10-28 03:57:14 +09:00
masayuki.harada 4649f0f615 Merge remote-tracking branch 'remotes/origin/develop_SA_SIM' into develop_SA_L3 2020-10-27 19:47:49 +09:00
yaojie a5343618cf Added the judgment of the NGAP field in the configuration file 2020-10-27 07:40:09 +00:00
Wu.Jing 66bc0bac1e Merge branch 'master' into develop_SA_L3 2020-10-26 09:04:03 +00:00
Wu.Jing 08e775559b Merge branch 'develop_SA_SIM' into develop_SA_L3 2020-10-26 09:02:18 +00:00
Wu.Jing 92ba7dc249 Merge branch 'develop_SA_NGAP' into develop_SA_RRC 2020-10-26 06:20:02 +00:00
masayuki.harada 1ce1e8f82b Merge branch 'oai_develop'
# Conflicts:
#	ci-scripts/Jenkinsfile-gitlab
2020-10-26 15:03:58 +09:00