maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,338 Commits 5 Branches 0 Tags
fe6aa838eadb036d74fcf63bdd67d2b0a917adcd
Commit Graph
517 Commits
Author SHA1 Message Date
Raymond Knopp da9b879112 Merge remote-tracking branch 'origin/develop-nr' into develop-nr-less-logging 
Conflicts:
	openair1/SCHED_NR/sched_nr.h
 2019-05-18 15:49:13 +02:00
Raymond Knopp 26d5eb90b6 intermediate commit to synch machine 2019-05-03 13:37:22 +02:00
laurent 7368e4bfc4 fix compilation tests 2019-05-02 12:17:31 +02:00
Laurent 4d787625ab still to compile 2019-04-30 14:25:42 +02:00
laurent 8a92138086 rework threads in 5G 2019-04-30 10:17:08 +02:00
Florian Kaltenberger 83e9908adb merging develop with develop-nr 2018-10-25 03:15:09 -07: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 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
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 5f4432a351 Read configuration parameter Broadcast PLMN index for MME 2018-09-28 11:45:56 +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
Robert Schmidt 3c6d0aed1b Read PLMN list configuration into RRC/S1AP 2018-09-22 22:52:15 +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 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
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 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 70e1841bb1 Fix: RAN API: remove_ul_slice() frees ul sched_name pointer, when sched_name set, free it when resetting 2018-09-05 14:21:39 +02:00
Robert Schmidt cbc78cd3db Don't warn of ignoring sorting 2018-09-05 14:21:39 +02:00
Robert Schmidt fa27b6dcce Fix: Correct numbering of protobuf messages (as in RTC) 2018-09-05 14:21:39 +02:00
Robert Schmidt 972f52fd56 fix remove LOG_N in restart 2018-09-03 18:10:28 +02:00
Robert Schmidt 08b122e3ff FlexRAN: update slice config array dimensions 2018-09-03 18:10:28 +02:00
Robert Schmidt 204281e3af change types in RCconfig_flexran(), avoid seg fault 
the integration of the nfapi-L2-emulator-for-develop (f254107b2) added more
types in the RCconfig_flexran(), but they were partially wrong. This commit
fixes those types after the rebase of this branch on top of 2018.w19
 2018-09-03 18:10:28 +02:00
Robert Schmidt cca5c1b71a FlexRAN: use correct identifiers for PDCP, RRC 
* give the correct UE_id instead an index of the protobuf message (they can
  diverge from each other)
* in the PDCP part of the RAN API, the RAN API has to make the conversion UE_id
  (MAC) to UID (PDCP)
* a follow up commit could clean up the interfaces:
  - the MAC functions take the UE_id
  - the RRC functions take the RNTI
  - the PDCP functions take the UID
  this would mean the caller has to find those ID but would decrease
  computations since the RAN API functions do not have to do that themselves
 2018-09-03 18:10:28 +02:00
Robert Schmidt 3b80c73f93 FlexRAN: Loop over UEs using UE_id, not index 2018-09-03 18:10:28 +02:00
Robert Schmidt 9399bed23a FlexRAN MAC: align allocated memory for lfds 2018-09-03 18:10:28 +02:00
Robert Schmidt 0bb6a19f71 only initialize RC.mac once 2018-09-03 18:10:28 +02:00
Robert Schmidt 62957b97d8 bugfix FlexRAN: only write to file if file is not null 2018-09-03 18:10:28 +02:00
Robert Schmidt 604ec25a68 improve soft-restarting messages 2018-09-03 18:10:28 +02:00
Robert Schmidt 917b9ca0c2 correct ITTI task name 2018-09-03 18:10:28 +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
Robert Schmidt ef0d86564c when sending config report, copy slice config to new mem 2018-09-03 18:10:28 +02:00
Robert Schmidt 7a0c00330b put intra-/inter slice sharing within slice config 2018-09-03 18:10:28 +02:00
Robert Schmidt 44481a5649 FlexRAN: improve info messages 2018-09-03 18:10:28 +02:00
Robert Schmidt 472ebf5622 mark UL slice sorting overwriting as TODO 2018-09-03 18:10:28 +02:00