Cedric Roux
1c6b9f0eda
Merge remote-tracking branch 'origin/develop' into x2
...
Conflicts:
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/rrc_defs.h
2019-02-13 15:20:45 +01:00
Raymond Knopp
e704e7ccc0
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
2019-02-07 23:58:17 +01:00
Cedric Roux
be68e1e651
Merge remote-tracking branch 'origin/develop' into x2
...
Conflicts:
common/utils/msc/msc.h
openair2/X2AP/x2ap_eNB.c
2019-02-01 14:27:55 +01:00
Raphael Defosseux
64144a8442
Merge remote-tracking branch 'origin/issue391-removeunusedcode_L2L1task' into develop_integration_2019_w04
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-01-24 15:33:19 +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
frtabu
9d0c70c9fe
remove L1L2 task, also remove some call to send messages to UNKNOWN_TASK, removed in new itti. Align LOG in rlc sources with new LOG code (remove DEBUG_RLC...)
2019-01-21 19:43:19 +01:00
Cedric Roux
1c4ec9e90b
fix dlsim compilation
2019-01-21 17:24:26 +01:00
Raymond Knopp
c47e1fc97f
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
2019-01-19 12:14:23 +01:00
Cedric Roux
7d481c5734
Merge remote-tracking branch 'origin/develop' into x2
2019-01-18 10:40:01 +01:00
Cedric Roux
246abce5d1
Merge remote-tracking branch 'origin/develop' into x2
...
Conflicts:
openair2/ENB_APP/enb_config.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.h
openair2/RRC/LTE/rrc_defs.h
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB_S1AP.c
openair2/RRC/LTE/rrc_proto.h
openair3/GTPV1-U/gtpv1u_eNB.c
openair3/S1AP/s1ap_eNB_handlers.c
2019-01-18 10:35:39 +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
Konstantinos Alexandris
ea105c39b1
X2AP MOBILITY PROCEDURES (X2AP HANDOVER REQUEST/REQUEST ACK)
...
S1AP PATH SWITCH REQUEST/REQUEST ACK/FAILURE
RRC MEASUREMENT REPORT
MINOR CHANGES IN MAC LAYER
2018-12-18 13:45:03 +01:00
Louis Adrien Dufrene
cf07c4d394
astyle applied
2018-11-20 16:39:05 +01:00
Louis Adrien Dufrene
c194956da3
RRC timer thres removed from UE context and added to eNB RRC context, value 0 of thres equivalent to infinity
2018-11-20 14:15:50 +01:00
Raymond Knopp
6266d5c389
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
...
Conflicts:
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/edci.c
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/LTE_TRANSPORT/transport_eNB.h
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/config.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_bch.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/mac.h
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/rrc_defs.h
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB_S1AP.c
2018-11-19 00:43:49 +01:00
Raymond Knopp
246ee327fb
rework of configuration for eMTC/Sidelink. Removal of warnings introduced by eMTC code. Validation of configuration component for eMTC and regular LTE. Sidelink is still not configured.
2018-11-18 20:17:18 +01:00
Louis Adrien Dufrene
700437f184
astyle applied
2018-11-16 08:49:28 +01:00
Louis Adrien Dufrene
a409614185
Merge develop done, conflicts resolved
2018-11-13 10:49:20 +01:00
Louis Adrien Dufrene
287010f82f
RRC timer: last format done. Timer reset in scheduling of DTCH (DL/UL). Commit to test.
2018-11-13 10:21:38 +01:00
Haruki NAOI
7d9898a5bb
Merge remote-tracking branch 'remotes/origin/develop' into issue_345_l2_fapi_simulator_new
...
# Conflicts:
# openair2/LAYER2/PDCP_v10.1.0/pdcp.c
# openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
# openair2/LAYER2/RLC/rlc.c
2018-11-06 15:03:54 +09:00
Raymond Knopp
b27ed63fa9
lte-softmodem compiles, many memory faults during configuration ...
2018-11-03 22:51:24 +01:00
Raymond Knopp
007b003d0c
dlsim functional after develop->enhancement-ltem
2018-10-29 18:33:02 +01:00
Raymond Knopp
d24f521a5a
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
...
Conflicts:
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
openair1/PHY/LTE_TRANSPORT/edci.c
openair1/PHY/LTE_TRANSPORT/if4_tools.c
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/LTE_TRANSPORT/print_stats.c
openair1/PHY/LTE_TRANSPORT/pucch.c
openair1/PHY/LTE_TRANSPORT/transport_eNB.h
openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
openair1/PHY/impl_defs_lte.h
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/ENB_APP/enb_paramdef.h
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/defs.h
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_bch.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/pre_processor.c
openair2/LAYER2/MAC/rar_tools.c
openair2/LAYER2/MAC/ue_procedures.c
openair2/PHY_INTERFACE/IF_Module.c
openair2/RRC/LITE/rrc_common.c
openair2/RRC/LTE/L2_interface_ue.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/rrc_eNB.c
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ru.c
2018-10-29 07:54:17 +01:00
Y_Tomita
b60e861b14
Add --musim option for L2 FAPI simulator.
2018-10-25 22:09:33 +09:00
Bi-Ruei, Chiu
f58ad3c39f
Add prefix LTE_ to LTE-RRC generated data types by ASN1C_PREFIX=LTE_
...
1. Modify all expressions using original LTE-RRC data types for new generated ones
2. Does not change any program logic
2018-10-17 15:46:12 +08:00
Raphael Defosseux
d254f5b522
Merge branch 'feature-s1-flex' into develop_integration_2018_w_41
...
Introduction of S1-flex. It handles multiple PLMN IDs (up to 6) in the SIB as well as the selection of an MME based on the selected PLMN identity.
Major impact: changes on the eNB configuration files:
tracking_area_code = 1;
plmn_list = (
{ mcc = 208; mnc = 94; mnc_length = 2; },
{ mcc = 208; mnc = 95; mnc_length = 2; }
)
See https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/s1-flex-conf-nnsf for more details.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2018-10-11 15:57:36 +02:00
Raphael Defosseux
bb566eaeb8
Merge remote-tracking branch 'origin/x2' into develop_integration_2018_w39
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2018-09-28 17:00:21 +02:00
Robert Schmidt
81e70dfc25
NAS First REQ: Forward selected PLMN Identity
2018-09-28 11:46:06 +02:00
Robert Schmidt
77b9ad2bfc
Change type S1AP REG REQ: Pass Broadcast PLMN index for MME selection
2018-09-28 11:45:56 +02:00
Robert Schmidt
72ef8be88e
Change types in S1AP Register REQ: list of MCC/MNC/TAC
2018-09-22 22:52:11 +02:00
Robert Schmidt
d85054c214
Change types in RRC: list of MCC/MNC/TAC
2018-09-22 22:51:48 +02:00
Konstantinos Alexandris
67cc97a42c
Merge remote-tracking branch 'origin/develop' into x2
2018-09-21 16:01:52 +02:00
Konstantinos Alexandris
2c27a38dc3
x2ap: implement x2setuprequest, x2setupresponse, x2setupfailure
2018-09-21 15:58:36 +02:00
laurent
d8472426c4
fix_issue_350_gtpu_init
2018-09-20 12:37:26 +02:00
Cedric Roux
afb2fd4012
Merge remote-tracking branch 'origin/x2' into develop_integration_2018_w36
2018-09-07 16:15:13 +02:00
Cedric Roux
2cb87ddd02
Merge remote-tracking branch 'origin/feature-slice+restart-w35' into develop_integration_2018_w36
...
Conflicts:
openair2/ENB_APP/flexran_agent_common_internal.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
2018-09-07 16:13:40 +02:00
Konstantinos Alexandris
2b85c4a3a6
Pass multi socket descriptor in SCTP + add SCTP multi init req/resp mechanism
2018-09-07 15:15:41 +02:00
Konstantinos Alexandris
1729b3dc66
X2AP: init funcs (register/association) + handler/management functions
...
SCTP: one to many sockets implementation
2018-09-06 15:49:59 +02:00
laurent
46231a5d5d
merge with latest develop
2018-09-06 09:43:26 +02:00
laurent
abbffef015
fix some exit situations, that was badly done by SIGUSR1 handler
2018-09-05 17:03:19 +02:00
Robert Schmidt
c4077f3cf7
cell reconfiguration/restart: take protobuf, perform in ENB_APP
...
* instead of the lengthy YAML parsing, can now handle protobuf message
* after setting the parameters, send a message to ENB_APP to perform it
* old YAML way still works
2018-09-03 18:10:28 +02:00
Niccolò Iardella
9efd5d6f27
Inter/intra-slice sharing are now optional
2018-09-03 18:10:28 +02:00
Niccolò Iardella
8d9a8ab59a
Add UE sorting on LCID priority
2018-09-03 18:10:28 +02:00
Konstantinos Alexandris
3b3b971807
minor fixes for x2 + modify conf files
...
The configuration file has now to contain ENB_IPV4_ADDRESS_FOR_X2C and
ENB_PORT_FOR_X2C in the NETWORK_INTERFACES section.
For example:
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.12.111/24";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
2018-08-23 16:15:14 +02:00
Konstantinos Alexandris
40942e34a0
Initial commit on X2AP (add target eNBs as input)
2018-08-22 15:32:22 +02:00