Commit Graph
2247 Commits
Author SHA1 Message Date
Melissa Elkadi b8444ecbc1 Merge branch 'eurecom-develop' into episys/mel/sa_development_init 2021-11-03 08:54:06 -07:00
hardy cb9defc629 Merge remote-tracking branch 'origin/develop-NR_SA_nrUE_security_update' into integration_2021_wk44 2021-11-03 13:38:33 +01:00
Melissa Elkadi 1dec9dd9f6 First attempt at receiving MIB and SIB in SA mode 2021-10-29 13:49:56 -07:00
hardy 3963f2fe66 Merge remote-tracking branch 'origin/develop-improve-SA-config' into integration_2021_wk44 2021-10-29 15:26:22 +02:00
Melissa Elkadi cfb49c17d2 Added a seprate queue for chan_params 2021-10-28 10:32:28 -07:00
Melissa Elkadi 18aaa88517 Merge branch 'eurecom-develop' into episys/mel/merge_bw_testing_abs 2021-10-27 08:05:26 -07:00
hardy af7d9cd920 Merge remote-tracking branch 'origin/nr_sdap_gnb' into integration_2021_wk44 2021-10-27 15:07:53 +02:00
hardy de801af6c1 Merge remote-tracking branch 'origin/nr_ue_mac_pdu_fixes_sr_bsr' into integration_2021_wk44 2021-10-27 14:51:49 +02:00
luis_pereira87 e333a53bdd Merge branch 'develop' into develop-improve-SA-config 2021-10-27 12:09:46 +01:00
Melissa Elkadi 16b5da25a2 Merge branch 'episys/master-nsa' into episys/mel/merge_bw_testing_abs 2021-10-26 16:18:21 -07:00
luis_pereira87 68fef91816 Apply the NSA t_Reordering value also for SA 2021-10-26 19:04:03 +01:00
Melissa Elkadi 8a56d146cc Merge branch 'episys/master-nsa' into episys/mel/merge_bw_testing_abs 2021-10-25 11:07:59 -07:00
Melissa Elkadi e4ad4a6b17 Merge branch 'episys/master-nsa' into origin-episys-merge-nsa 2021-10-25 10:46:36 -07:00
Melissa Elkadi b56c8ac3ce Merge remote-tracking branch 'eurecom/develop' into origin-episys-merge-nsa 2021-10-25 10:27:11 -07:00
Melissa Elkadi 2edfdb20a4 Merge remote-tracking branch 'eurecom/develop' into episys/mel/merge_bw_testing_abs 2021-10-25 09:52:23 -07:00
Mario Joa-Ng d483410e2a Merge develop. 2021-10-20 21:06:16 -04:00
frtabu c3c02bbd91 Use same port number for source and destination number in new gtp implementation. 2021-10-20 17:09:46 +02:00
frtabu 9707cb9910 rebase on develop 2021-10-20 17:09:46 +02:00
Melissa Elkadi 58eb8d2af4 Creating new queue for ul_ttis if dl_tti is late
Also, this commit changes the len argument in the
pusharray32 to match the actual field type (uint16_t).
There is also simple name change from sf -> slot.
The new queueing system is not a permanent solution.
It was simply a way for us to try to handle late
dl_tti_requests. If we queue every single ul_tti_req
that we get, the queue gets full very quickly becasue
we only remove ul_ttis from the queue when a uci has
been populated with a matching sfn/sf. Because of this,
we only queue ul_ttis if we have a uci_indication
prepared already. Rarely, a dl_tti_req will arrive at
the NRUE too late, and the NRUE does not have time
to create the uci_ind so we dont process the corresponding
ul_tti. A seprate queue was made to hold all other ul_ttis
the arrive in the NRUE (this queue will continuously
get full and then emptied) but will occasionally hold
a ul_tti that corresponds to a uci that hasnt
been populated yet.
2021-10-19 07:59:55 -07:00
Deokseong "David" Kim a5d23a0e08 Fixed nr_dlsim and nr_ulsim build errors. 2021-10-13 16:27:13 +00:00
luis_pereira87 545ee44407 Remove unreachable "else" statement 2021-10-11 18:14:45 +01:00
Melissa Elkadi 746d074646 Queuing all nFAPI messages and handling after slot ind
This commit changes the stub functionality entirely.
We are now queueing any received NR nFAPI message
and handling it only after we recevie a slot ind
that corresponds with the nFAPI message's sfn/slot
value. When doing this, an existing issue has been
brought to light. The gNB and NR UE are not in sync
when it comes to their slot indications. Generally,
the NR UE seems to be ahead of the gNB by around 6-7
slots. This commit has a hack... when we receive a
slot indication at the moment, we decrament it by 6
to try to keep the NRUE from being ahead of the gNB.
This will be fixed shortly... This was a temporary
fix..
2021-10-06 18:13:13 -07:00
rmagueta ff34838423 Put back scheduling request configuration after the cherry-pick which solved the segfault 2021-09-30 17:18:00 +01:00
Melissa Elkadi 62118252dd Merge remote-tracking branch 'eurecom/bandwidth-testing-abs' into episys/mel/merge_bw_testing_abs 2021-09-28 13:13:54 -07:00
rmagueta 1ab23d4b96 Remove commented functions 2021-09-28 17:25:38 +01:00
Masayuki Harada f818307143 Remove warning. 2021-09-29 01:20:36 +09:00
rmagueta 5630c434a8 Revert sl10 to 7 2021-09-28 17:13:56 +01:00
Masayuki Harada 7cd75730d3 Remove ifndef PHYSIM conditions. 2021-09-29 01:02:22 +09:00
Masayuki Harada 80831cd48f Fix nr_derive_key memory problem. 2021-09-29 00:10:48 +09:00
Masayuki Harada 2fb3816722 Fix NRUE NAS security configuration. 2021-09-28 20:26:48 +09:00
athanassopoulos 86161e475d Fix: nrUE not processing SDAP header 2021-09-27 18:37:06 +02:00
Laurent THOMAS 57aed7ea9b fix memory error in do_nrMeasurementReport 2021-09-27 18:11:55 +02:00
Melissa Elkadi 70be674227 Code clean up part 2.
This commit continues to clean up the reminader
of the changed files in the merge req 1274.
The changes include log updates, comment removals,
etc.
2021-09-23 14:19:55 -07:00
mjoang 626e3a7015 merge develop 2021-09-23 10:44:43 -04:00
Masayuki Harada c522caf490 Merge remote-tracking branch 'remotes/oai/develop' into develop-NR_SA_nrUE_security_update 2021-09-18 19:07:17 +09:00
Melissa Elkadi d2daf8e860 Change slot_ahead to process ack/nack after pdsch 2021-09-15 11:07:27 -07:00
Melissa Elkadi 2ac8d4b680 Properly handling cellGroupConfig in NR UE 2021-09-14 09:10:47 -07:00
Melissa Elkadi c8ca564212 Merge remote-tracking branch 'eurecom/develop' into episys/mel/merge_develop_cfra_working_9_14_21 2021-09-14 08:36:54 -07:00
Melissa Elkadi 6a8e4e2883 Merge remote-tracking branch 'eurecom/develop' into episys/mel/merge_develop_cfra_working 2021-09-14 07:34:58 -07:00
Raymond Knopp 37b135b616 logging and DL-CCCH decoding size:: 2021-09-11 13:58:08 +02:00
rmagueta b898981109 Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
2021-09-10 10:03:22 +01:00
Mario Joa-Ng 82e6d04e56 fix bugs in GNB MAC nr_store_dlsch_buffer()
This commit is to handle multipe UE correctly.
Right now UE #1 and UE #2 can both ping google.
2021-09-09 16:10:20 -07:00
Masayuki Harada edd179c263 Merge remote-tracking branch 'remotes/oai/nr-pdcp-security-w34' into develop-NR_SA_nrUE_security_update 2021-09-09 19:40:46 +09:00
rmagueta 71cd100335 Merge remote-tracking branch 'origin/nr-pdcp-security-w34' into bandwidth-testing-abs
# Conflicts:
#	ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
#	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2021-09-08 17:22:28 +01:00
rmagueta 722505f22d Merge remote-tracking branch 'origin/bandwidth-testing' into bandwidth-testing-abs
# Conflicts:
#	openair1/PHY/MODULATION/slot_fep_nr.c
#	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
#	openair2/LAYER2/NR_MAC_UE/config_ue.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-09-08 17:05:01 +01:00
rmagueta 204bffbc7a Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs
# Conflicts:
#	executables/nr-uesoftmodem.c
#	executables/nr-uesoftmodem.h
#	executables/softmodem-common.h
#	openair2/LAYER2/NR_MAC_UE/mac_proto.h
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-09-08 16:31:24 +01:00
Masayuki Harada d0575640fc Add calc kgnb and PDCP security settings in nrUE. 2021-09-08 22:52:50 +09:00
francescomani afdb5728ed fix for pointa computation in sib1 2021-09-08 14:21:28 +02:00
Eurecom 15c5ea07bc Merge remote-tracking branch 'origin/develop' into bandwidth-testing
Conflicts:
	executables/nr-uesoftmodem.c
	executables/nr-uesoftmodem.h
	executables/softmodem-common.h
	openair2/LAYER2/NR_MAC_UE/mac_proto.h
	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
2021-09-06 11:53:56 +02:00
Cedric Roux eeca38368e gnb sa: improve security
Note: some modifications have been done to the UE too, but for syntactic
reasons. The UE may fail to work, not tested.

For the UE, we have the problem of handling properly SecurityModeCommand.
We don't verify its integrity. This is a bit complicated to handle properly
and may require some API changes in the PDCP layer. So, as of today, the
integrity of this message is not verified.

Also, NSA mode has been touched, but it should not be a problem. But not
tested, so not sure.
2021-09-06 11:06:47 +02:00