Commit Graph
2360 Commits
Author SHA1 Message Date
Raymond Knopp c8cef9e1fb fixes after merge with develop 2018-10-20 15:30:48 +02:00
Raymond Knopp ea11edadb3 Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement-external-timing 2018-10-19 09:50:42 +02:00
Cedric Roux 27395c083d hotfix: hardcode PLMN selection in the UE to value 1 (was 2)
Fix the assertion:
Assertion ((instance_p->mnc_digit_length[ue_desc_p->selected_plmn_identity] == 3) || (instance_p->mnc_digit_length[ue_desc_p->selected_plmn_identity] == 2)) failed!
In s1ap_eNB_handle_nas_first_req() /home/ubuntu/tmp/openair3/S1AP/s1ap_eNB_nas_procedures.c:243

With this hotfix the UE selects the first PLMN sent by the eNodeB.

The UE has to select the correct PLMN from those received in SIB1. This
will be done with a later merge request.
2018-10-15 14:57:56 +02:00
kvyat c0ae3ce21f X2: fixing order of calls
Signed-off-by: kvyat <kvyat@kvyat.eurecom.fr>
2018-10-12 16:38:18 +02:00
Raphael Defosseux 34c14f1ab3 Merge remote-tracking branch 'origin/356-compilation-fail-for-256-ue' into develop_integration_2018_w_41 2018-10-11 16:10:19 +02: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 405bb0bba1 CI: astyling for ease of merge
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-10-11 15:08:21 +02:00
Raphael Defosseux 7e7acef764 CI: astyling to ease merge
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-10-11 15:07:16 +02:00
laurent 090fcc5aae move mem_block to heap 2018-10-08 11:25:16 +02:00
Raphael Defosseux 7260c9a908 Merge remote-tracking branch 'origin/fix_ulsim' into develop_integration_2018_w40 2018-10-04 13:10:23 +02:00
laurent f7b69a7b93 manual merge because conflict 2018-10-03 19:56:29 +02:00
Florian Kaltenberger 3547d525f4 Merge remote-tracking branch 'origin/develop' into 352-support-for-n300 2018-09-29 12:09:51 -07: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
Raphael Defosseux 38d09bc733 Merge remote-tracking branch 'origin/parallel-config' into develop_integration_2018_w39
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-09-28 16:58:12 +02:00
Robert Schmidt b1d1d4c834 X2AP configuration: Use more idiomatic AssertFatal than if 2018-09-28 11:46:11 +02:00
Robert Schmidt b485310ef6 Read X2AP PLMN ID from new configuration file structure 2018-09-28 11:46:11 +02:00
Robert Schmidt a4bc48a2f7 Fix in paging: iterate list of MCC/MNC/TAC 2018-09-28 11:46:11 +02:00
Robert Schmidt 81e70dfc25 NAS First REQ: Forward selected PLMN Identity 2018-09-28 11:46:06 +02:00
Robert Schmidt 5f4432a351 Read configuration parameter Broadcast PLMN index for MME 2018-09-28 11:45:56 +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 a52156cf26 Remove unused MCC/MNC in eNB_RRC_INST 2018-09-28 11:45:56 +02:00
Robert Schmidt 514b8d833a Use selectedPLMN_Identity IE to fill GUMMEI at NAS_FIRST_REQ 2018-09-28 11:45:56 +02:00
Robert Schmidt 413b307441 SIB1: Add all configured PLMN IDs in System Information 2018-09-28 11:45:52 +02:00
Florian Kaltenberger 84d04b3cd5 new interpretation of sdr_addrs string in RU config file: this is now directly passed to the uhd to specify a device. It may contain a device type (i.e., "type=x300") or an IP address (i.e., "addr=192.168.10.2") 2018-09-28 00:11:35 -07:00
laurent dd4f1ab73c coarse gain cleaning 2018-09-27 14:13:52 +02:00
Robert Schmidt 3c6d0aed1b Read PLMN list configuration into RRC/S1AP 2018-09-22 22:52:15 +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
Wang Tsu-Han 2dc3dfa373 adding parallel config in dlsim and ulsim 2018-09-20 15:17:32 +02:00
laurent d8472426c4 fix_issue_350_gtpu_init 2018-09-20 12:37:26 +02:00
Wang Tsu-Han 0511ff45dc adding both configurable at config file and commandline 2018-09-20 12:06:55 +02:00
Wang Tsu-Han c5cd47f976 fixes for not having parallel config inside the config file 2018-09-12 15:32:44 +02:00
Wang Tsu-Han 3005929bca modify threading option into config file 2018-09-11 18:50:11 +02:00
Cedric Roux 00e21e74a6 integration fix: better error reporting in case of X2 failure
If the IP address for X2AP is not good, the error message reported
was very unclear. Attempt to make it better.
2018-09-10 16:32:20 +02:00
Cedric Roux 833016123a hotfix: revert commits that break the basic simulator
This commit manually reverts the commits:
- 97c69dc4a4
- 3278aa494d

The basic simulator was not functional anymore because
the UE did not send RRCConnectionSetupComplete due to
some problem in the PDCP layer, most probably.
2018-09-10 16:22:03 +02:00
Cedric Roux 82ab88f546 integration fix: add missing break
This break was there and went away, for whatever reason...
2018-09-07 17:24:37 +02:00
Cedric Roux c1d96a49ca Merge remote-tracking branch 'origin/nasmesh_new_kernel' into develop_integration_2018_w36 2018-09-07 17:01:28 +02:00
Cedric Roux 73da898f9b integration fix: fix bad merge conflict resolution + fix compilation error 2018-09-07 16:57:55 +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
Cedric Roux 2c9be8c102 Merge remote-tracking branch 'origin/fix-nfapi-in-scheduler' into develop_integration_2018_w36 2018-09-07 16:08:09 +02:00
Cedric Roux b0eff6c0a6 Merge remote-tracking branch 'origin/scheduler-small-fix' into develop_integration_2018_w36 2018-09-07 16:07:23 +02:00
Cedric Roux cbdc8f662a Merge remote-tracking branch 'origin/issue343_dlcqi_retransmission' into develop_integration_2018_w36 2018-09-07 16:04:05 +02:00
laurent 7d22622474 fix nasmesh kernel 4.15 2018-09-07 15:44:57 +02:00
Konstantinos Alexandris 938e0242e2 Merge remote-tracking branch 'origin/develop' into x2
Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/ENB_APP/enb_app.c
	openair2/X2AP/x2ap_common.h
2018-09-07 15:30:49 +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
Masayuki HARADA c1359a103f Fix wrong slice_allocation loop in fairRR scheduler 2018-09-06 19:03:05 +02:00
Cedric Roux 8534982afe bugfix: check that we are manipulating the structure for the correct RNTI
The bug popped up when one UE was doing TCP UL iperf and a second UE
attempted to connect. A crash of the eNB happened because we changed
the wrong NFAPI structure in a TTI where both UEs are scheduled.

Something like that.
2018-09-06 16:42:10 +02:00