Raymond Knopp
ed08f3ab1b
Merge remote-tracking branch 'origin/signal-delay' into ru_rau_enhancement_L1_renaming
...
Conflicts:
openair1/PHY/defs_eNB.h
openair1/SCHED/fapi_l1.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/prach_procedures.c
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-uesoftmodem.c
2019-04-20 08:28:43 +02:00
Raymond Knopp
ca111641d4
Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement_L1_renaming
...
Conflicts:
cmake_targets/build_oai
cmake_targets/oaisim_build_oai/CMakeLists.template
cmake_targets/oaisim_mme_build_oai/CMakeLists.template
cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/if4_tools.c
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/LTE_TRANSPORT/pucch.c
openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
openair1/PHY/impl_defs_lte.h
openair1/SCHED/fapi_l1.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SIMULATION/LTE_PHY/dlsim.c
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_paramdef.h
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.h
2019-04-14 20:34:03 +02:00
frtabu
30b7c973e0
merge nfapi_cleanup
2019-04-05 18:43:40 +02:00
Raphael Defosseux
1008be908c
Merge remote-tracking branch 'origin/tdd-fixes-2019-w11' into develop_integration_2019_w13
2019-03-28 10:23:46 +01:00
Robert Schmidt
1f590efe2b
Merge branch 'develop' into feature-127-protocol-split
2019-03-19 14:49:07 +01:00
Cedric Roux
69ccf51f96
bugfix: fix compilation
...
T has to be generated before compiling targets SCHED_RU_LIB and SCHED_UE_LIB.
2019-03-19 09:25:43 +01:00
Robert Schmidt
62d9b8cf36
Merge branch 'develop' into feature-127-protocol-split
2019-03-14 13:10:21 +01:00
Cedric Roux
9456fe584a
x2ap: timers, cleanup
...
This commit introduces X2AP timers (t_reloc_prep, tx2_reloc_overall).
You need to set the values in the configuration file.
X2AP can be enabled or disabled in the configuration file too (disabled
by default).
Some deadcode was removed.
2019-03-13 15:28:37 +01:00
Raphael Defosseux
95569173d5
Merge remote-tracking branch 'origin/issue407_nos1_siml1_datapath' into develop_integration_2019_w10
2019-03-11 10:37:42 +01:00
frtabu
c9dcaa53af
noS1 woking with tun interfaces and basic simu
2019-03-08 16:00:09 +01:00
Robert Schmidt
bbedd315e7
Correctly link lte-uesoftmodem(-nos1) (hack)
...
Although not used in the UE, we currently need to link the F1 library into it.
This is because we do not define ASN_DISABLE_OER_SUPPORT (otherwise, F1 has
compilation problems). In this case, some functions are apparently not
correctly defined, giving linker errors in the UE. Linking F1 in solves the
problem.
This is a hack. It would be better to be able to define ASN_DISABLE_OER_SUPPORT
and have no compilation errors or compile everything with
ASN_DISABLE_OER_SUPPORT except F1. I did not do this because I did not find
another way than add target_compile_definitions() to every target except F1
which adds many lines just so that one target (F1 ASN.1) compiles correctly (in
other words, F1 needs to be fixed).
2019-03-06 19:28:12 +01:00
Robert Schmidt
275b559fbf
Fix linker error: link F1-U protobuf for eNB noS1 case
2019-03-06 14:18:54 +01:00
Cedric Roux
c394188e73
x2: first implementation of ID management, some cleanup
...
Some deadcode was removed.
The implementation of the ID management is not finished.
It will only work if the handover is successful. No error
recovery has been done. For error recovery, we need to
implement the X2AP timers. As it is, in case of error, an ID
might very well never be released.
It has been tested with 1 and 2 UEs doing handover more or less
at the same time.
2019-03-05 14:56:42 +01:00
Robert Schmidt
f9c4c501e3
Merge branch 'develop' into feature-127-protocol-split
2019-03-05 14:17:38 +01:00
frtabu
87a8cb28a5
basic and rf simulators as config option to allow noS1 datapath debug.
2019-03-04 22:07:32 +01:00
Raphael Defosseux
0f11865fa4
Merge remote-tracking branch 'origin/issue-404-pdcp-integrity' into develop_integration_2019_w09
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-02-28 14:37:10 +01:00
Cedric Roux
e3782b5ca2
bugfix: fix PDCP sequence management (plus some cleanup)
...
With the introduction of X2AP into develop, the UEs now have to regularly
send measurement reports.
In the logs of the eNB, we see:
[OSA] Mismatch found in integrity for algorithm 2,
got e0.a0.c2.66, expecting a5.9c.cb.57
[PDCP] [OSA][RB 1] eNB failed to validate MAC-I of incoming PDU
This is a bug in the PDCP layer that uses wrong parameters to compute the
integrity.
This commit fixes this bug.
The function pdcp_is_rx_seq_number_valid was removed. Its processing
has been directly integrated into the function pdcp_data_ind.
The function pdcp_mark_current_pdu_as_received is not called anymore.
Its processing was not used later on, so as of today, not calling it does
not introduce any functional change.
The function pdcp_validate_security takes now as parameters both
SN and HFN. Same for the function pdcp_get_next_count_rx.
Useless constants PDCP_SN_5BIT, PDCP_SN_7BIT and PDCP_SN_12BIT have been
removed.
The compilation option ENABLE_SECURITY has been removed. It's now always
on. (This may impact some use cases.)
The PDCP for DRB using RLC AM is not correct. It was not correct before
this commit (apart from the integrity bug). We should deal with a list
of PDUs and transmit packets to upper layers as detailed in the specs.
Today we transmit the PDU as soon as we get it. We don't care about
duplicates, in-order delivery, timeouts.
Also, we don't deal with "PDCP re-establishment". Not sure how that impacts
the software.
And, last but not least, there is still no ROHC.
2019-02-27 12:33:04 +01:00
Robert Schmidt
030e11ba9a
Merge branch 'develop' into feature-127-protocol-split
2019-02-21 20:18:35 +01:00
frtabu
3f61d5f720
fix compilation warning
2019-02-17 23:46:45 +01:00
frtabu
38d772d8a2
nos1 et s1 execs identical, nos1 enforced based on exec name or --noS1 option
2019-02-17 23:46:45 +01:00
Raphael Defosseux
21aec74478
Merge remote-tracking branch 'origin/rhel76-support' into develop_integration_2019_w07_v2
2019-02-15 09:55:40 +01:00
Raphael Defosseux
4766a694c8
RHE7.6: UHD installation should be now correct
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-02-13 10:37:00 +01:00
Raphael Defosseux
d035be0dd3
Fix for all other OS versions
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-02-13 10:04:40 +01:00
Raymond Knopp
b7cbb43130
minor change for UHD on RHEL7.6
2019-02-12 17:24:18 +01:00
Raymond Knopp
b22f2d888a
minor changes in CMakelists.txt for building on RHEL7.6. Note, the optional packages in
...
/etc/yum.repos.d/redhat.repo by setting "enabled = 1" in [rhel-6-server-optional-rpms] section
2019-02-10 14:45:58 +01:00
Raymond Knopp
e704e7ccc0
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
2019-02-07 23:58:17 +01:00
Robert Schmidt
9fd4b45226
Remove F1-related flags from build_oai script
2019-02-07 18:03:17 +01:00
Raymond Knopp
72b5745abb
Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement-external-timing
...
Conflicts:
openair1/PHY/LTE_TRANSPORT/if4_tools.c
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/defs_eNB.h
openair1/SCHED_UE/phy_procedures_lte_ue.c
openair1/SIMULATION/LTE_PHY/dlsim.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.h
targets/RT/USER/lte-uesoftmodem.c
targets/RT/USER/rfsim.c
2019-01-26 11:54:10 +01:00
Raphael Defosseux
f031fda986
CI: hotfix on the CentOS build on OSA bench
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-01-25 10:07:50 +01:00
Raphael Defosseux
8260607ed6
CI: fix in L2-simulator VM build start script
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-01-22 21:37:40 +01:00
Raymond Knopp
c47e1fc97f
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
2019-01-19 12:14:23 +01:00
Raphael Defosseux
4075fbc86a
Merge remote-tracking branch 'origin/develop' into issue_345_l2_fapi_simulator_new_jan2019
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-01-17 18:19:46 +01:00
Raphael Defosseux
d73685933c
Merge remote-tracking branch 'origin/develop' into issue_345_l2_fapi_simulator_new
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-01-16 11:21:27 +01:00
Cedric Roux
aea6b4b5a6
fix a lot of file mode
...
For whatever reason most of the files had their permission
changed from 644 to 755, which is not wanted.
2019-01-07 16:22:28 +01:00
Raymond Knopp
44a225c6b7
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
...
Conflicts:
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/SCHED/fapi_l1.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/COMMON/rrc_messages_types.h
openair2/ENB_APP/enb_config.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/mac.h
openair2/RRC/LTE/L2_interface.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.h
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB_S1AP.c
targets/RT/USER/lte-enb.c
2019-01-05 23:28:31 +01:00
laurent
80ac9ece17
issue 384
2018-12-23 18:05:51 +01:00
laurent
b3f1440249
issue 384
2018-12-23 17:55:07 +01:00
Raphael Defosseux
81e81ab469
Merge remote-tracking branch 'origin/iris_hw_new' into develop_integration_2018_w51
2018-12-20 10:43:46 +01:00
Rahman Doost
c76bbd13f1
iris soapy0.7 support
2018-12-19 14:49:56 -06:00
Raphael Defosseux
f3488567c3
Merge remote-tracking branch 'origin/381-limesdr-compilation-fail' into develop_integration_2018_w51
2018-12-18 14:48:24 +01:00
Raphael Defosseux
c5a2be4c7e
Merge remote-tracking branch 'origin/379-make' into develop_integration_2018_w51
2018-12-18 14:46:29 +01:00
Raphael Defosseux
ee9f8d8fa7
Merge remote-tracking branch 'origin/iris_hw_new' into develop_integration_2018_w51
2018-12-18 14:44:50 +01:00
Laurent
aacbd7577c
fix 381
2018-12-13 13:45:59 +01:00
Laurent
89229ac59a
fix issue 379
2018-12-12 14:49:54 +01:00
Laurent
1b659b936c
fix issue 379
2018-12-12 14:21:00 +01:00
Clayton Shepard
5832204fe1
Added Iris hardware support.
...
Signed-off-by: Rahman Doost <doost@rice.edu >
2018-12-05 09:47:15 -06:00
Raphael Defosseux
0d67854ce0
Merge remote-tracking branch 'origin/add-mac_MainConfig-to-RRCConnectionSetup' into develop_integration_w48
2018-11-28 18:10:56 +01:00
Raymond Knopp
134a39fa34
Merge remote-tracking branch 'origin/add-mac_MainConfig-to-RRCConnectionSetup' into enhancement-ltem
...
Conflicts:
cmake_targets/CMakeLists.txt
2018-11-26 23:02:29 +01:00
Raymond Knopp
552bd6979d
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
...
Conflicts:
openair2/RRC/LTE/MESSAGES/asn1_msg.c
2018-11-26 23:01:47 +01:00
Raymond Knopp
b89f9284dd
adds a mac_MainConfig information element to RRCConnectionSetup. This is to configure PHR reporting during the first part of the Attach procedure.
2018-11-21 20:24:24 +01:00