fix withS1 issue

Summary of changes:
- bug fixes: random access, crash on physicalConfigDedicated)
- some work on the UE to have it functional again
- IQ record and playback (work from Nokia)
  see documentation at: https://gitlab.eurecom.fr/oai/openairinterface5g/merge_requests/244

LICENSE

@@ -1,94 +1,200 @@
-                      OAI PUBLIC LICENSE V1.0
+				The OpenAirInterface Software Alliance (OSA)
+					OAI Public License (Version 1.1)
 
- Copyright (C) 2016 OpenAirInterface Software Alliance, Inc. <http://www.openairinterface.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+LICENSE TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION OF OPENAIR 5G SOFTWARE.
 
-Definitions.
-“License” shall mean the terms and conditions for use, reproduction, and distribution set forth in this  document.
+1.	Definitions.
+
+“License” shall mean the terms and conditions for use, reproduction, and distribution set forth 
+in this document.
 
 “Licensor” shall mean the OpenAirInterface Software Alliance.
 
-“Legal Entity” shall mean the union, at the time an acting entity joins the Alliance, of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, “control” means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+“Legal Entity” shall mean the union, at the time an acting entity joins the Alliance, of the 
+acting entity and all other entities that control, are controlled by, or are under common control 
+with that entity. For the purposes of this definition, “control” means (i) the power, direct or 
+indirect, to cause the direction or management of such entity, whether by contract or 
+otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) 
+beneficial ownership of such entity.
 
-“You” (or “Your”) shall mean an individual or Legal Entity exercising permissions granted by this License.
+“You” (or “Your”) shall mean an individual or Legal Entity exercising permissions granted by 
+this License.
 
-“Source” form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+“Source” form shall mean the preferred form for making modifications, including but not 
+limited to software source code, documentation source, and configuration files.
 
-“Object” form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+“Object” form shall mean any form resulting from mechanical transformation or translation of 
+a Source form, including but not limited to compiled object code, generated documentation, 
+and conversions to other media types.
 
-“OpenAirInterface Software Alliance” shall mean the endowment fund established at the initiative of Eurecom, an educational and research establishment located at Campus Sophia Tech, 450 Route des Chappes, 06410 Biot, France, which statutes were signed on 18 November 2014.
+“OpenAirInterface Software Alliance” shall mean the endowment fund established at the 
+initiative of Eurecom, an educational and research establishment located at Campus Sophia 
+Tech, 450 Route des Chappes, 06410 Biot, France, which statutes were signed on 18 
+November 2014.
 
-“ “Work” shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+“Work” shall mean the work of authorship, whether in Source or Object form, made available 
+under the License, as indicated by a copyright notice that is included in or attached to the 
+work (an example is provided in the Appendix below).
 
-“Derivative Works” shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+“Derivative Works” shall mean any work, whether in Source or Object form, that is based on 
+(or derived from) the Work and for which the editorial revisions, annotations, elaborations, or 
+other modifications represent, as a whole, an original work of authorship. For the purposes of 
+this License, Derivative Works shall not include works that remain separable from, or merely 
+link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
 
-“Contribution” shall mean any work of authorship that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, “submitted” means any form of electronic, , or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work “Contributor License Agreement” shall mean the agreement signed by any Contributor setting forth the terms and conditions applicable to its Contribution. “Contributor” shall mean any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+“Contribution” shall mean any work of authorship that is intentionally submitted to Licensor 
+for inclusion in the Work by the copyright owner or by an individual or Legal Entity 
+authorized to submit on behalf of the copyright owner. For the purposes of this definition, 
+“submitted” means any form of electronic, , or written communication sent to the Licensor or 
+its representatives, including but not limited to communication on electronic mailing lists, 
+source code control systems, and issue tracking systems that are managed by, or on behalf of, 
+the Licensor for the purpose of discussing and improving the Work
 
-Grant of Copyright License.
-Subject to the terms and conditions of this License, Licensor and each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form
+“Contributor License Agreement” shall mean the agreement signed by any Contributor setting 
+forth the terms and conditions applicable to its Contribution. 
 
-3. Grant of Patent License.
+“Contributor” shall mean any individual or Legal Entity on behalf of whom a Contribution 
+has been received by Licensor and subsequently incorporated within the Work.
 
-3.1 Grant of Patent License for non-commercial purposes:
+2.	Grant of Copyright License.
+Subject to the terms and conditions of this License, Licensor and each Contributor hereby 
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable 
+copyright license to reproduce, prepare Derivative Works of, publicly display, publicly 
+perform, and distribute the Work and such Derivative Works in Source or Object form
 
-Subject to the terms and conditions of this License, Licensor and each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, import, and otherwise transfer the Work, for non-commercial purposes, where such license applies only to those patent claims licensable by such Contributor or Licensor that are necessarily infringed by the Work and/or their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted.
+3. 	Grant of Patent License.
 
-3.2 Grant of Patent License for commercial purposes:
+3.1 Grant of Patent License for study, testing and research purposes:
+Subject to the terms and conditions of this License, Licensor and each Contributor hereby 
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable 
+(except as stated in this section) patent license to make, have made, use, and otherwise 
+transfer (excluding selling) the Work, solely for study, testing and research purposes, where 
+such license applies only to those patent claims licensable by Licensor or such Contributor 
+that are necessarily infringed respectively by the Work and/or the said Contributor 
+Contribution(s) alone or by combination of their Contribution(s) with the Work  to which 
+such Contribution(s) was submitted (“Essential Patents”).
 
-For commercial purposes, and subject to the terms and conditions of this License, You commits to be prepared to negotiate a patent license with each Contributor and/or the Licensor on Fair, Reasonable and Non-Discriminatory (“FRAND”) terms and conditions for the Work or Contribution(s) incorporated within the Work.
-
-Licensor and/or each Contributor, by submitting a Contribution, will identify any patent it owns related to the Work and/or its Contribution.
+3.2 Grant of Patent License for purposes other than study and research:
+For purposes other than study, testing and research, and subject to the terms and conditions of 
+this License, You commit to be prepared to negotiate a non-exclusive, non-transferable, non-
+assignable license of Essential Patents with each Contributor and/or the Licensor on Fair, 
+Reasonable and Non-Discriminatory (“FRAND”) terms and conditions for the use of the 
+Work or Contribution(s) incorporated within the Work.
+Licensor and/or each Contributor, by submitting a Contribution, will identify any of its known 
+Essential Patent it owns related to the Work and/or its Contribution.
 
 3.3 Patent Litigation
+If You institute patent litigation against any entity making use of the Work solely for study, 
+testing and research purposes (including a cross-claim or counterclaim in a lawsuit) alleging 
+that the Work or a Contribution incorporated within the Work constitutes direct or 
+contributory patent infringement, then the patent licenses granted to You under section 3.1 of 
+this License for that Work shall terminate as of the date such litigation is filed.
 
-If You institute patent litigation against any entity making non-commercial use of the Work (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+4. Sublicensing
+You may grant sublicenses under the licenses granted under sections 2 and 3.1 provided that 
+the sublicense is subject to and inclusive of all the terms of and rights under this License to 
+which the Work is or was distributed by the OpenAirInterface Software Alliance.
 
-4. Redistibution
+5. Redistribution
+Subject to terms and conditions set forth in sections 2 and 3, You may reproduce and 
+distribute copies of the Work or Derivative Works thereof in any medium, with or without 
+modifications, and in Source or Object form, provided that You meet the following 
+conditions:  
 
-Subject to terms and conditions set forth in articles 2 and 3, You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+1. You must give any other recipients of the Work or Derivative Works a copy of this 
+License; and
 
+2. You must cause any modified files by You to carry prominent notices stating that You 
+changed the files; and
 
+3. You must retain, in the Source form of any Derivative Works that You distribute, all 
+copyright, patent, trademark, and attribution notices from the Source form of the Work, 
+excluding those notices that do not pertain to any part of the Derivative Works; and
 
+4. If the Work includes a “NOTICE” text file as part of its distribution, then any Derivative 
+Works that You distribute must include a readable copy of the attribution notices contained 
+within such NOTICE file, excluding those notices that do not pertain to any part of the 
+Derivative Works, in at least one of the following places: within a NOTICE text file 
+distributed as part of the Derivative Works; within the Source form or documentation, if 
+provided along with the Derivative Works; or, within a display generated by the Derivative 
+Works, if and wherever such third-party notices normally appear. The contents of the 
+NOTICE file are for informational purposes only and do not modify the License. You may 
+add Your own attribution notices within Derivative Works that You distribute, alongside or as 
+an addendum to the NOTICE text from the Work, provided that such additional attribution 
+notices cannot be construed as modifying the License. 
+You may add Your own copyright statement to Your modifications and may provide 
+additional or different license terms and conditions for use, reproduction, or distribution of 
+Your modifications, or for any such Derivative Works as a whole, provided Your use, 
+reproduction, and distribution of the Work otherwise complies with the conditions stated in 
+this License.
 
-1. You must give any other recipients of the Work or Derivative Works a copy of this License; and
+6. Submission of Contributions. 
+Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be 
+under the terms and conditions of this License, without any additional terms or conditions. 
+Notwithstanding the above, nothing herein shall supersede or modify the terms of any 
+separate license agreement such as the Contributor License Agreement You may have 
+executed with Licensor regarding such Contributions.
 
-2. You must cause any modified files by You to carry prominent notices stating that You changed the files; and
+7. Trademarks. 
+This License does not grant permission to use the trade names, trademarks, service marks, or 
+product names of the Licensor, except as required for reasonable and customary use in 
+describing the origin of the Work and reproducing the content of the NOTICE file.
 
-3. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+8. Disclaimer of Warranty. 
+Unless required by applicable law or agreed to in writing, Licensor provides the Work (and 
+each Contributor provides its Contributions) on an “AS IS” BASIS, WITHOUT 
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, 
+without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, 
+MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely 
+responsible for determining the appropriateness of using or redistributing the Work and 
+assume any risks associated with your exercise of permissions under this License.
 
-4. If the Work includes a “NOTICE” text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+9. Limitation of Liability. 
+In no event and under no legal theory, whether in tort (including negligence), contract, or 
+otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or 
+agreed to in writing, shall Licensor and any Contributor, as such, be liable to You for 
+damages, including any direct, indirect, special, incidental, or consequential damages of any 
+character arising as a result of this License or out of Your use or inability to use the Work 
+(including but not limited to damages for loss of goodwill, work stoppage, computer failure or 
+malfunction, or any and all other commercial damages or losses), even if such Contributor has 
+been advised of the possibility of such damages.
 
+10. Accepting Warranty or Additional Liability. 
+While redistributing the Work or Derivative Works thereof, You may choose to offer, and 
+charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations 
+and/or rights consistent with this License. However, in accepting such obligations, You may 
+act only on Your own behalf and on Your sole responsibility, not on behalf of any other 
+Contributor and/or the Licensor, and only if You agree to indemnify, defend, and hold each 
+Contributor and/or the Licensor harmless for any liability incurred by, or claims asserted 
+against, such Contributor and/or Licensor by reason of Your accepting any such warranty or 
+additional liability.
 
-You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions. Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement such as the Contributor License Agreement You may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall Licensor and any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor and/or the Licensor,and only if You agree to indemnify, defend, and hold each Contributor and/or the Licensor harmless for any liability incurred by, or claims asserted against, such Contributor and/or Licensor by reason of Your accepting any such warranty or additional liability.
-
-10. Applicable law. The present license shall be governed by the laws of France.
+11. Applicable law. 
+The present license shall be governed by the laws of France.
 
 END OF TERMS AND CONDITIONS
 
-APPENDIX: How to apply the PRESENT OPENAIR 5G License to your work
-To apply the present License to your work, attach the following boilerplate notice, with the fields enclosed by brackets “[]” replaced with your own identifying information. (Don’t include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same “printed page” as the copyright notice for easier identification within third-party archives.
+1.	APPENDIX: How to apply the PRESENT OPENAIR 5G License to your work
+To apply the present License to your work, attach the following boilerplate notice, with the 
+fields enclosed by brackets “[]” replaced with your own identifying information. (Don’t 
+include the brackets!) The text should be enclosed in the appropriate comment syntax for the 
+file format. We also recommend that a file or class name and description of purpose be 
+included on the same “printed page” as the copyright notice for easier identification within 
+third-party archives.
 
 Copyright [yyyy] [name of copyright owner]
-Licensed under the License terms and conditions for use, reproduction, and distribution of OPENAIR 5G software (the “License”);
 
-you may not use this file except in compliance with the License.You may obtain a copy of the License at
-Unless required by applicable law or agreed to in writing, software
+Licensed under the License terms and conditions for use, reproduction, and distribution of 
+OPENAIR 5G software (the “License”);
 
-distributed under the License is distributed on an “AS IS” BASIS,
+you may not use this file except in compliance with the License. You may obtain a copy of 
+the License at
+
+Unless required by applicable law or agreed to in writing, software distributed under the 
+License is distributed on an “AS IS” BASIS,
 
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
-See the License for the specific language governing permissions and
+See the License for the specific language governing permissions and limitations under the 
+License.
 
-limitations under the License.

README.txt

@@ -43,3 +43,4 @@ v0.5.2 -> Last version with old code for oaisim (abstraction mode works)
 v0.6 -> RRH functionality, UE greatly improved, better TDD support,
         a lot of bugs fixed. WARNING: oaisim in PHY abstraction mode does not
         work, you need to use v0.5.2 for that.
+v0.6.1 -> Mostly bugfixes. This is the last version without NFAPI.

cmake_targets/CMakeLists.txt

@@ -3,7 +3,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *
@@ -27,6 +27,8 @@ cmake_minimum_required (VERSION 2.8)
 # Base directories, compatible with legacy OAI building
 ################################################
 set (OPENAIR_DIR     $ENV{OPENAIR_DIR})
+#set (NFAPI_DIR       $ENV{NFAPI_DIR})
+set (NFAPI_DIR       ${OPENAIR_DIR}/nfapi)
 set (OPENAIR1_DIR    ${OPENAIR_DIR}/openair1)
 set (OPENAIR2_DIR    ${OPENAIR_DIR}/openair2)
 set (OPENAIR3_DIR    ${OPENAIR_DIR}/openair3)
@@ -239,6 +241,8 @@ add_boolean_option(UE_AUTOTEST_TRACE   False "Activate UE autotest specific logs
 add_boolean_option(UE_DEBUG_TRACE      False "Activate UE debug trace")
 add_boolean_option(UE_TIMING_TRACE     False "Activate UE timing trace")
 add_boolean_option(DISABLE_LOG_X       False "Deactivate all LOG_* macros")
+add_boolean_option(USRP_REC_PLAY       False "Enable USRP record playback mode")
+add_boolean_option(UE_EXPANSION_SIM2   False "UE EXPANSION SIM2")
 
 add_boolean_option(DEBUG_CONSOLE False "makes debugging easier, disables stdout/stderr buffering")
 
@@ -259,6 +263,14 @@ if (${ENABLE_ITTI})
   set(GTPU_need_ITTI ${OPENAIR3_DIR}/GTPV1-U/gtpv1u_eNB.c)
 endif (${ENABLE_ITTI})
 
+set (UDP_DIR ${OPENAIR_DIR}/common/utils/udp)
+  add_library(UDP_L1L2
+    # add .h files if depend on (this one is generated)
+    ${UDP_DIR}/udp_com.h
+    ${UDP_DIR}/udp_com.c
+    )
+  set(UDP_LIB UDP_L1L2)
+
 add_boolean_option(RTAI False "Use RTAI")
 
 
@@ -289,7 +301,7 @@ elseif (${RRC_ASN1_VERSION} STREQUAL "CBA")
 elseif (${RRC_ASN1_VERSION} STREQUAL "Rel10")
   set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1c/ASN1_files/EUTRA-RRC-Definitions-a20.asn)
 else()
-  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1c/ASN1_files/RRC-e10.asn)
+  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1c/ASN1_files/RRC-e30.asn)
 endif  (${RRC_ASN1_VERSION} STREQUAL "Rel8")
 
 set (RRC_FULL_DIR ${asn1_generated_dir}/${RRC_ASN1_VERSION})
@@ -310,11 +322,11 @@ if (NOT ${ret} STREQUAL 0)
   message(FATAL_ERROR "${fix_asn1c_call}: error")
 endif (NOT ${ret} STREQUAL 0)
 file(GLOB rrc_source ${RRC_FULL_DIR}/*.c)
-set(rrc_source  ${rrc_source} ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1_msg.c)
 file(GLOB rrc_h ${RRC_FULL_DIR}/*.h)
 set(rrc_h ${rrc_h} ${RRC_FULL_DIR}/asn1_constants.h)
 set_source_files_properties(${rrc_source} PROPERTIES COMPILE_FLAGS -w) # suppress warnings from generated code
-add_library(RRC_LIB ${rrc_h} ${rrc_source})
+add_library(RRC_LIB ${rrc_h} ${rrc_source}
+    ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1_msg.c)
 include_directories ("${RRC_FULL_DIR}")
 
 # add the command to generate the source code
@@ -484,11 +496,27 @@ add_list1_option(NB_ANTENNAS_RX "2" "Number of antennas in reception" "1" "2" "4
 add_list1_option(NB_ANTENNAS_TX "4" "Number of antennas in transmission" "1" "2" "4")
 add_list1_option(NB_ANTENNAS_TXRX "2" "Number of antennas in ????" "1" "2" "4")
 
-add_list2_option(RF_BOARD "EXMIMO" "RF head type" "None" "EXMIMO" "OAI_USRP" "OAI_BLADERF" "OAI_SKIQ" "CPRIGW" "OAI_LMSSDR")
+add_list2_option(RF_BOARD "EXMIMO" "RF head type" "None" "EXMIMO" "OAI_USRP" "OAI_BLADERF" "CPRIGW" "OAI_LMSSDR")
 
 add_list2_option(TRANSP_PRO "None" "Transport protocol type" "None" "ETHERNET")
-
-
+#NOKIA config enhancement
+set (CONFIG_ROOTDIR
+    ${OPENAIR_DIR}/common/config
+   )
+set (CONFIG_SOURCES
+    ${CONFIG_ROOTDIR}/config_load_configmodule.c
+    ${CONFIG_ROOTDIR}/config_userapi.c
+    ${CONFIG_ROOTDIR}/config_cmdline.c
+   ) 
+set (CONFIG_LIBCONFIG_SOURCES
+    ${CONFIG_ROOTDIR}/libconfig/config_libconfig.c
+   )   
+add_library(params_libconfig MODULE ${CONFIG_LIBCONFIG_SOURCES} )
+target_link_libraries(params_libconfig config)  
+# shared library loader
+set (SHLIB_LOADER_SOURCES
+    ${OPENAIR_DIR}/common/utils/load_module_shlib.c
+)
 # include RF devices / transport protocols library modules
 ######################################################################
 
@@ -515,18 +543,6 @@ set(HWLIB_BLADERF_SOURCE
 add_library(oai_bladerfdevif MODULE ${HWLIB_BLADERF_SOURCE} )
 target_link_libraries(oai_bladerfdevif bladeRF)
 
-set (SKIQ_SDK     $ENV{SKIQ_SDK})
-
-include_directories("${OPENAIR_TARGETS}/ARCH/SKIQ/USERSPACE/LIB/")
-set (option_HWSKIQLIB_lib "-L ${SKIQ_SDK}/lib/support/x86_64.gcc/usr/lib/epiq ${SKIQ_SDK}/lib/libsidekiq__x86_64.gcc.a ${SKIQ_SDK}/arg_parser/lib/arg_parser__x86_64.gcc.a -lglib-2.0 -Wl,--enable-new-dtags -Wl,-rpath,/usr/lib/epiq ")
-set(HWLIB_SKIQ_SOURCE 
-  ${OPENAIR_TARGETS}/ARCH/SKIQ/USERSPACE/LIB/skiq_lib.c
-  )
-add_library(oai_skiqdevif MODULE ${HWLIB_SKIQ_SOURCE}  )
-FIND_LIBRARY(LIBSIDEKIQ NAMES "libsidekiq__x86_64.gcc.a" "arg_parser__x86_64.gcc.a" PATHS ${SKIQ_SDK}/lib NO_DEFAULT_PATH)
-target_link_libraries(oai_skiqdevif ${LIBSIDEKIQ})
-target_include_directories(oai_skiqdevif PRIVATE "${SKIQ_SDK}/sidekiq_core/inc")
-set (CMAKE_SHARED_LINKER_FLAGS "-lglib-2.0 -Wl,--enable-new-dtags -Wl,-rpath,/usr/lib/epiq")  
 include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/")
 
 set(HWLIB_LMSSDR_SOURCE
@@ -558,6 +574,15 @@ add_library(oai_mobipass MODULE ${TPLIB_MOBIPASS_SOURCE} )
 get_target_property(mobipas_cflags oai_mobipass COMPILE_FLAGS)
 set_target_properties(oai_mobipass PROPERTIES COMPILE_FLAGS "${mobipass_cflags} -fvisibility=hidden")
 
+set(HWLIB_TCP_BRIDGE_SOURCE
+  ${OPENAIR_TARGETS}/ARCH/tcp_bridge/tcp_bridge.c
+  )
+add_library(oai_tcp_bridge MODULE ${HWLIB_TCP_BRIDGE_SOURCE} )
+
+#get_target_property(tcp_bridge_cflags oai_tcp_bridge COMPILE_FLAGS)
+#set_target_properties(oai_tcp_bridge PROPERTIES COMPILE_FLAGS "${tcp_bridge_cflags} -fvisibility=hidden")
+set_target_properties(oai_tcp_bridge PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
+
 ##########################################################
 
 include_directories ("${OPENAIR_TARGETS}/ARCH/COMMON")
@@ -753,6 +778,7 @@ else()
   include_directories("${OPENAIR2_DIR}/UTIL")
   include_directories("${OPENAIR2_DIR}/UTIL/LOG")
 endif()
+include_directories("${NFAPI_DIR}")
 include_directories("${OPENAIR1_DIR}")
 include_directories("${OPENAIR2_DIR}/NAS")
 include_directories("${OPENAIR2_DIR}")
@@ -982,10 +1008,12 @@ add_library(SECU_CN ${SECU_CN_SRC})
 # Scheduler
 ################################"
 set(SCHED_SRC
+  ${OPENAIR1_DIR}/SCHED/fapi_l1.c
   ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_eNb.c
   ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_ue.c
   ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_common.c
-  ${OPENAIR1_DIR}/SCHED/phy_mac_stub.c
+  ${OPENAIR1_DIR}/SCHED/ru_procedures.c
+#  ${OPENAIR1_DIR}/SCHED/phy_mac_stub.c
   ${OPENAIR1_DIR}/SCHED/pucch_pc.c
   ${OPENAIR1_DIR}/SCHED/pusch_pc.c
   ${OPENAIR1_DIR}/SCHED/srs_pc.c
@@ -1014,6 +1042,7 @@ set(PHY_SRC
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/lte_mcs.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pbch.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/edci.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/phich.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pcfich.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pucch.c
@@ -1066,7 +1095,6 @@ set(PHY_SRC
   ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c
   ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c
   ${OPENAIR1_DIR}/PHY/CODING/lte_rate_matching.c
-  ${OPENAIR1_DIR}/PHY/CODING/rate_matching.c
   ${OPENAIR1_DIR}/PHY/CODING/viterbi.c
   ${OPENAIR1_DIR}/PHY/CODING/viterbi_lte.c
   ${OPENAIR1_DIR}/PHY/INIT/lte_init.c
@@ -1098,6 +1126,7 @@ add_library(PHY ${PHY_SRC})
 #Layer 2 library
 #####################
 set(MAC_DIR ${OPENAIR2_DIR}/LAYER2/MAC)
+set(PHY_INTERFACE_DIR ${OPENAIR2_DIR}/PHY_INTERFACE)
 set(RLC_DIR ${OPENAIR2_DIR}/LAYER2/RLC)
 set(RLC_UM_DIR ${OPENAIR2_DIR}/LAYER2/RLC/UM_v9.3.0)
 set(RLC_AM_DIR ${OPENAIR2_DIR}/LAYER2/RLC/AM_v9.3.0)
@@ -1148,7 +1177,7 @@ set(L2_SRC
   ${RRC_DIR}/L2_interface.c
   )
 set (MAC_SRC
-  ${MAC_DIR}/lte_transport_init.c
+  ${PHY_INTERFACE_DIR}/IF_Module.c
   ${MAC_DIR}/main.c
   ${MAC_DIR}/ue_procedures.c
   ${MAC_DIR}/ra_procedures.c
@@ -1583,6 +1612,7 @@ ${OPENAIR1_DIR}/SIMULATION/TOOLS/multipath_tv_channel.c
 ${OPENAIR1_DIR}/SIMULATION/RF/rf.c
 ${OPENAIR1_DIR}/SIMULATION/RF/dac.c
 ${OPENAIR1_DIR}/SIMULATION/RF/adc.c
+${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
 )
 
 add_library(SIMU_ETH
@@ -1590,7 +1620,7 @@ ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
 ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/multicast_link.c
 ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/socket.c
 ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/bypass_session_layer.c
-${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/emu_transport.c
+#${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/emu_transport.c
 ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/pgm_link.c
 )
 
@@ -1745,6 +1775,7 @@ add_executable(lte-softmodem
   ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
   ${OPENAIR_TARGETS}/RT/USER/lte-ue.c
   ${OPENAIR_TARGETS}/RT/USER/lte-enb.c
+  ${OPENAIR_TARGETS}/RT/USER/lte-ru.c
   ${OPENAIR_TARGETS}/RT/USER/lte-softmodem.c
   ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
   ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
@@ -1759,11 +1790,13 @@ add_executable(lte-softmodem
   ${XFORMS_SOURCE}
   ${XFORMS_SOURCE_SOFTMODEM}
   ${T_SOURCE}
+  ${CONFIG_SOURCES}
+  ${SHLIB_LOADER_SOURCES}
   )
 
-target_link_libraries (lte-softmodem -ldl
+target_link_libraries (lte-softmodem -ldl 
   -Wl,--start-group
-  RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
+  RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} ${UDP_LIB} LFDS7
   -Wl,--end-group )
 
 target_link_libraries (lte-softmodem ${LIBXML2_LIBRARIES})
@@ -1780,6 +1813,7 @@ add_executable(lte-softmodem-nos1
   ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
   ${OPENAIR_TARGETS}/RT/USER/lte-ue.c
   ${OPENAIR_TARGETS}/RT/USER/lte-enb.c
+  ${OPENAIR_TARGETS}/RT/USER/lte-ru.c
   ${OPENAIR_TARGETS}/RT/USER/lte-softmodem.c
   ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
   ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
@@ -1793,10 +1827,12 @@ add_executable(lte-softmodem-nos1
   ${XFORMS_SOURCE}
   ${XFORMS_SOURCE_SOFTMODEM}
   ${T_SOURCE}
+  ${CONFIG_SOURCES}
+  ${SHLIB_LOADER_SOURCES}
   )
 target_link_libraries (lte-softmodem-nos1
   -Wl,--start-group
-  RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${ITTI_LIB} ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
+  RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${ITTI_LIB} ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} ${UDP_LIB} LFDS7
   -Wl,--end-group )
 
 target_link_libraries (lte-softmodem-nos1 ${LIBXML2_LIBRARIES})
@@ -1860,7 +1896,7 @@ add_executable(oaisim
   ${x2ap_h}
   ${OPENAIR_BIN_DIR}/messages_xml.h
   ${OPENAIR_TARGETS}/RT/USER/lte-ue.c
-  ${OPENAIR_TARGETS}/RT/USER/lte-enb.c
+  ${OPENAIR_TARGETS}/RT/USER/lte-ru.c
   ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
   ${OPENAIR_TARGETS}/SIMU/USER/channel_sim.c
   ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
@@ -1880,13 +1916,15 @@ add_executable(oaisim
   ${OPENAIR_TARGETS}/COMMON/create_tasks.c
   ${XFORMS_SOURCE}
   ${T_SOURCE}
+  ${CONFIG_SOURCES}
+  ${SHLIB_LOADER_SOURCES}
 )
 
 
 target_include_directories(oaisim PUBLIC  ${OPENAIR_TARGETS}/SIMU/USER)
 target_link_libraries (oaisim
   -Wl,-ldl,--start-group
-  RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB GTPV1U SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${MSC_LIB} L2 ${RAL_LIB} LIB_NAS_UE SIMU SIMU_ETH SECU_OSA ${ITTI_LIB}  ${MIH_LIB}
+  RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB GTPV1U SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${MSC_LIB} L2 ${RAL_LIB} LIB_NAS_UE SIMU SECU_OSA ${ITTI_LIB}  ${MIH_LIB} ${UDP_LIB}
   -Wl,--end-group )
 
 target_link_libraries (oaisim ${LIBXML2_LIBRARIES} ${LAPACK_LIBRARIES})
@@ -1906,6 +1944,7 @@ add_executable(oaisim_nos1
   ${x2ap_h}
   ${OPENAIR_BIN_DIR}/messages_xml.h
   ${OPENAIR_TARGETS}/RT/USER/lte-ue.c
+  ${OPENAIR_TARGETS}/RT/USER/lte-ru.c
   ${OPENAIR_TARGETS}/RT/USER/lte-enb.c
   ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
   ${OPENAIR_TARGETS}/SIMU/USER/channel_sim.c
@@ -1923,11 +1962,13 @@ add_executable(oaisim_nos1
   ${OPENAIR_DIR}/common/utils/system.c
   ${XFORMS_SOURCE}
   ${T_SOURCE}
+  ${CONFIG_SOURCES}
+  ${SHLIB_LOADER_SOURCES}
 )
 target_include_directories(oaisim_nos1 PUBLIC  ${OPENAIR_TARGETS}/SIMU/USER)
 target_link_libraries (oaisim_nos1
   -Wl,--start-group
-  RRC_LIB X2AP_LIB SECU_CN UTIL HASHTABLE SCHED_LIB PHY LFDS ${MSC_LIB} L2 ${RAL_LIB} SIMU SIMU_ETH SECU_OSA ${ITTI_LIB}  ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
+  RRC_LIB X2AP_LIB SECU_CN UTIL HASHTABLE SCHED_LIB PHY LFDS ${MSC_LIB} L2 ${RAL_LIB} SIMU SECU_OSA ${ITTI_LIB}  ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} ${UDP_LIB} LFDS7
   -Wl,--end-group )
 
 target_link_libraries (oaisim_nos1 ${LIBXML2_LIBRARIES} ${LAPACK_LIBRARIES})
@@ -2044,7 +2085,7 @@ if (${T_TRACER})
         oai_eth_transpro
         FLPT_MSG ASYNC_IF FLEXRAN_AGENT HASHTABLE MSC UTIL OMG_SUMO SECU_OSA
         SECU_CN SCHED_LIB PHY L2 default_sched remote_sched RAL MIH CN_UTILS
-        GTPV1U SCTP_CLIENT UDP LIB_NAS_UE LFDS LFDS7 SIMU SIMU_ETH OPENAIR0_LIB)
+        GTPV1U SCTP_CLIENT UDP LIB_NAS_UE LFDS LFDS7 SIMU OPENAIR0_LIB)
     if (TARGET ${i})
       add_dependencies(${i} generate_T)
     endif()
@@ -2074,6 +2115,7 @@ endforeach()
 # we can't use cXX standard as pthread_rwlock_t is gnu standard
 list(APPEND itti_compiler_options "-std=gnu89")
 set (ITTI_H ${ITTI_DIR}/intertask_interface_types.h)
+set (UDP_H ${UDP_DIR}/udp_com.h)
 if(EXISTS /usr/bin/gccxml)
    set(xml_command gccxml ${itti_compiler_options} -fxml=${OPENAIR_BIN_DIR}/messages.xml ${ITTI_H})
 else()

cmake_targets/at_commands/CMakeLists.txt

@@ -3,7 +3,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/core.py

@@ -3,7 +3,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/log.py

@@ -3,7 +3,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/openair.py

@@ -3,7 +3,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/run_compilation_autotests.bash

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/run_exec_autotests.bash

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/run_exec_lte-softmodem_tests.py

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/configure_cots_bandrich_ue.py

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/configure_cots_huaweiE398_ue.py

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/configure_cots_sony_experia_m4_ue.py

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/configure_usrpb210.py

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/find_usb_path.bash

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/free_mem.bash

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/git-retry.sh

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/iperf3_script

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/iperf3_script_phone

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/iperf_script

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/iperf_script_phone

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/lib_autotest.py

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/run_gdb

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/search_repl.py

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/v2/actions/3276.txt

@@ -0,0 +1,13 @@
+When running lsusb, if you have:
+
+    Bus 001 Device 002: ID 12d1:14fe Huawei Technologies Co., Ltd. Modem (Mass Storage Mode)
+
+You need to run:
+
+    usb_modeswitch -v 12d1 -p 14fe -M '55534243123456780000000000000011062000000100000000000000000000'
+
+After what, running lsusb should give:
+
+    Bus 001 Device 004: ID 12d1:1506 Huawei Technologies Co., Ltd. Modem/Networkcard
+
+Values of 'Bus' and 'Device' may differ of course.

cmake_targets/autotests/v2/actions/bandrich.txt

@@ -13,6 +13,16 @@ containing lines:
     SUBSYSTEM=="tty", ENV{ID_VENDOR_ID}=="1a8d", ENV{ID_MODEL_ID}=="100d", ENV{ID_SERIAL_SHORT}=="357473040068155", ENV{ID_USB_INTERFACE_NUM}=="00", SYMLINK+="bandrich.data", MODE="0666"
     SUBSYSTEM=="tty", ENV{ID_VENDOR_ID}=="1a8d", ENV{ID_MODEL_ID}=="100d", ENV{ID_SERIAL_SHORT}=="357473040068155", ENV{ID_USB_INTERFACE_NUM}=="02", SYMLINK+="bandrich.control", MODE="0666"
 
+To avoid NetworkManager to play with the bandrich, add also the line:
+
+    ENV{ID_VENDOR_ID}=="1a8d", ENV{ID_MM_DEVICE_IGNORE}="1"
+
+Maybe also add; , ENV{ID_MM_DEVICE_IGNORE}="1"
+to the two other lines.
+
+Then run: udevadm control --reload-rules
+And:      service network-manager restart
+
 Change vendor_id/model_id/serial/interface num to match yours.
 Use lsusb -v to find values.
 

cmake_targets/build_oai

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *
@@ -66,7 +66,9 @@ UE_AUTOTEST_TRACE="False"
 UE_DEBUG_TRACE="False"
 UE_TIMING_TRACE="False"
 DISABLE_LOG_X="False"
+USRP_REC_PLAY="False"
 BUILD_ECLIPSE=0
+UE_EXPANSION_SIM2="False"
 trap handle_ctrl_c INT
 
 function print_help() {
@@ -108,7 +110,7 @@ Options
    Rel8 limits the implementation to 3GPP Release 8 version
    Rel10 limits the implementation to 3GPP Release 10 version
 -w | --hardware
-   EXMIMO, USRP, SKIQ, BLADERF, ETHERNET, LMSSDR, None (Default)
+   EXMIMO, USRP, BLADERF, ETHERNET, LMSSDR, None (Default)
    Adds this RF board support (in external packages installation and in compilation)
 -t | --transport protocol
    ETHERNET , None
@@ -158,6 +160,10 @@ Options
    Disable all LOG_* macros
 --build-eclipse
    Build eclipse project files. Paths are auto corrected by fixprj.sh
+--usrp-recplay
+   Build for I/Q record-playback modes
+--ues-sim
+   Enable UE Expansion SIM2
 Usage (first build):
  oaisim (eNB + UE): ./build_oai -I  --oaisim -x --install-system-files
  Eurecom EXMIMO + COTS UE : ./build_oai -I  --eNB -x --install-system-files
@@ -227,7 +233,7 @@ function main() {
        -w | --hardware)
             HW="$2" #"${i#*=}"
             # Use OAI_USRP  as the key word USRP is used inside UHD driver           
-	    if [ "$HW" != "SKIQ" -a "$HW" != "BLADERF" -a  "$HW" != "USRP" -a "$HW" != "LMSSDR" -a  "$HW" != "None" -a  "$HW" != "EXMIMO"  ] ; then 
+	    if [ "$HW" != "BLADERF" -a  "$HW" != "USRP" -a "$HW" != "LMSSDR" -a  "$HW" != "None" -a  "$HW" != "EXMIMO"  ] ; then 
 		echo_fatal "Unknown HW type $HW will exit..."		
 	    else
 		if [ "$HW" == "USRP" ] ; then 
@@ -236,9 +242,6 @@ function main() {
 		if [ "$HW" == "BLADERF" ] ; then 
 		    HW="OAI_BLADERF"
 		fi
-		if [ "$HW" == "SKIQ" ] ; then 
-		    HW="OAI_SKIQ"
-		fi
 		if [ "$HW" == "LMSSDR" ] ; then 
 		    HW="OAI_LMSSDR"
 		fi 
@@ -336,6 +339,10 @@ function main() {
             UE_TIMING_TRACE="True"
             echo_info "Enabling UE timing trace"
             shift 1;;
+        --ues-sim)
+            UE_EXPANSION_SIM2="True"
+            echo_info "Enabling UE Expansion SIM2"
+            shift 1;;
         --disable-log)
             DISABLE_LOG_X="True"
             echo_info "Disabling all LOG_* traces"
@@ -348,7 +355,15 @@ function main() {
             BUILD_ECLIPSE=1
             CMAKE_CMD="$CMAKE_CMD"' -DCMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT=TRUE -G"Eclipse CDT4 - Unix Makefiles"'
             echo_info "Enabling build eclipse project support"
-            shift 1;;			
+            shift 1;;
+       --build-telnetsrv)
+            BUILD_TELNETSRV=1
+            echo_info "Build embedded telnet server"
+            shift ;;			
+        --usrp-recplay)
+            USRP_REC_PLAY="True"
+            echo_info "Enabling USRP record playback mode"
+            shift 1;;
         -h | --help)
             print_help
             exit 1;;
@@ -392,7 +407,6 @@ function main() {
   #Now we set flags to enable deadline scheduler settings
   #By default: USRP: disable, 
   #By default: BLADERF: enable,
-  #By default: SKIQ: enable,
   #By default: EXMIMO: enable
   if [ "$FORCE_DEADLINE_SCHEDULER_FLAG_USER" = "" ]; then
      if [ "$HW" = "EXMIMO" ] ; then 
@@ -402,9 +416,7 @@ function main() {
      elif [ "$HW" = "OAI_USRP" ] ; then 
         DEADLINE_SCHEDULER_FLAG_USER="False"
      elif [ "$HW" = "OAI_BLADERF" ] ; then 
-         DEADLINE_SCHEDULER_FLAG_USER="False"
-     elif [ "$HW" = "OAI_SKIQ" ] ; then 
-         DEADLINE_SCHEDULER_FLAG_USER="False"
+        DEADLINE_SCHEDULER_FLAG_USER="False"
      elif [ "$HW" = "OAI_LMSSDR" ] ; then 
         DEADLINE_SCHEDULER_FLAG_USER="False"
      elif [ "$HW" = "None" ] ; then 
@@ -475,13 +487,6 @@ function main() {
         flash_firmware_bladerf
       fi
     fi
-    if [ "$HW" == "OAI_SKIQ" ] ; then
-	echo_info "installing packages for SKIQ support"
-	check_install_skiq_driver
-	if [ ! "$DISABLE_HARDWARE_DEPENDENCY" == "True" ]; then
-            install_usrp_uhd_driver
-	fi
-    fi
     if [ "$FLEXRAN_AGENT" == "1" ] ; then
       echo_info "installing protobuf/protobuf-c for flexran agent support"
       install_protobuf_from_source
@@ -517,6 +522,9 @@ function main() {
       lte_exec=lte-softmodem
   fi
 
+# configuration module libraries, one currently available, using libconfig 
+  config_libconfig_shlib=params_libconfig
+  
   # first generate the CMakefile in the right directory
   if [ "$eNB" = "1" -o "$UE" = "1" -o "$HW" = "EXMIMO" ] ; then
 
@@ -546,6 +554,8 @@ function main() {
     echo "set (UE_DEBUG_TRACE $UE_DEBUG_TRACE)"        >>  $cmake_file
     echo "set (UE_TIMING_TRACE $UE_TIMING_TRACE)"        >>  $cmake_file
     echo "set (DISABLE_LOG_X $DISABLE_LOG_X)"        >>  $cmake_file
+    echo "set (USRP_REC_PLAY $USRP_REC_PLAY)"        >>  $cmake_file
+    echo "set (UE_EXPANSION_SIM2 $UE_EXPANSION_SIM2)"    >> $cmake_file
     if [ "$UE" = 1 -a "$NOS1" = "0" ] ; then
      echo_info "Compiling UE S1 build : enabling Linux and NETLINK"
      echo "set (LINUX True )"              >>  $cmake_file
@@ -553,7 +563,7 @@ function main() {
     fi
     echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
     cd  $DIR/$lte_build_dir/build
-    eval $CMAKE_CMD    
+    eval $CMAKE_CMD
   fi
 
   if [ "$eNB" = "1" -o "$UE" = "1" ] ; then
@@ -562,6 +572,11 @@ function main() {
 	  $lte_build_dir $lte_exec \
 	  $lte_exec $dbin/$lte_exec.$REL
 
+# mandatory shared lib
+    compilations \
+	  $lte_build_dir $config_libconfig_shlib \
+	  lib$config_libconfig_shlib.so $dbin/lib$config_libconfig_shlib.so
+	  
     if [ "$NOS1" = "1" ] ; then
 	compilations \
 	    $lte_build_dir nasmesh \
@@ -694,6 +709,7 @@ function main() {
     echo "set ( RRC_ASN1_VERSION \"${REL}\")" >>  $cmake_file
     echo "set ( ENABLE_VCD_FIFO $VCD_TIMING )" >>  $cmake_file
     echo "set ( T_TRACER $T_TRACER )"          >>  $cmake_file
+    echo "set (UE_EXPANSION_SIM2 $UE_EXPANSION_SIM2)"    >> $cmake_file
     echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
     [ "$CLEAN" = "1" ] && rm -rf $DIR/$oaisim_build_dir/build
     mkdir -p $DIR/$oaisim_build_dir/build
@@ -816,7 +832,22 @@ function main() {
 	 rrh_gw $dbin/rrh_gw
 
   fi
-  
+  # Telnet server compilation
+  #####################
+  if [ "$BUILD_TELNETSRV" = "1" ] ; then
+
+     telnetsrv_build_dir=telnetsrv
+     mkdir -p $DIR/$telnetsrv_build_dir/build
+     cd $DIR/$telnetsrv_build_dir/build   
+     echo_info "Compiling telnet server library ..."
+    
+     [ "$CLEAN" = "1" ] && rm -rf $DIR/$telnetsrv_build_dir 
+     cmake_file=$OPENAIR_DIR/common/utils/$telnetsrv_build_dir/CMakeLists.txt   
+     cd $DIR/$telnetsrv_build_dir/build
+     eval  "$CMAKE_CMD $OPENAIR_DIR/common/utils/$telnetsrv_build_dir/"
+     make
+
+  fi  
   # build RF device and transport protocol libraries
   #####################################
   if [ "$eNB" = "1" -o "$UE" = "1" -o  "$RRH" = "1" ] ; then
@@ -842,11 +873,9 @@ function main() {
 	      ln -sf $dbin/liboai_exmimodevif.so.$REL $dbin/liboai_device.so
 	      echo_info "liboai_device.so is linked to EXMIMO device library"       
 	  elif [ "$HW" == "OAI_USRP" ] ; then
-	      if [ -d "/usr/include/uhd" ] ; then
-		  compilations \
-		      $build_dir oai_usrpdevif \
-		      liboai_usrpdevif.so $dbin/liboai_usrpdevif.so.$REL
-	      fi
+              compilations \
+                  $build_dir oai_usrpdevif \
+                  liboai_usrpdevif.so $dbin/liboai_usrpdevif.so.$REL
 
 	      ln -sf liboai_usrpdevif.so liboai_device.so
 	      ln -sf $dbin/liboai_usrpdevif.so.$REL $dbin/liboai_device.so
@@ -858,19 +887,9 @@ function main() {
 		      liboai_bladerfdevif.so $dbin/liboai_bladerfdevif.so.$REL
 	      fi
 
-	      ln -s liboai_bladerfdevif.so liboai_device.so
-	      ln -s $dbin/liboai_bladerfdevif.so.$REL $dbin/liboai_device.so
-	      echo_info "liboai_device.so is linked to BLADERF device library"
-	  elif [ "$HW" == "OAI_SKIQ" ] ; then
-	      if [ -f $SKIQ_SDK/sidekiq_core/inc ] ; then
-		  compilations \
-		      $build_dir oai_skiqdevif \
-		      liboai_skiqdevif.so $dbin/liboai_skiqdevif.so.$REL
-	      fi
-
-	      ln -s liboai_skiqdevif.so liboai_device.so
-	      ln -s $dbin/liboai_skiqdevif.so.$REL $dbin/liboai_device.so
-	      echo_info "liboai_device.so is linked to SIDEKIQ device library"	 	      
+	      ln -sf liboai_bladerfdevif.so liboai_device.so
+	      ln -sf $dbin/liboai_bladerfdevif.so.$REL $dbin/liboai_device.so
+	      echo_info "liboai_device.so is linked to BLADERF device library"	 
 	  elif [ "$HW" == "OAI_LMSSDR" ] ; then
 #	      if [ -f "/usr/include/libbladeRF.h" ] ; then
 		  compilations \

cmake_targets/tools/asn1tostruct.py

@@ -38,7 +38,7 @@ def outputHeaderToFile(f, filename):
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

cmake_targets/tools/build_helper

@@ -3,7 +3,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/build_test_epc_tools

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/example_enb_exmimo_mme_hss.txt

@@ -3,7 +3,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/example_oaisim_enb_ue_mme_virtual.txt

@@ -3,7 +3,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/fix_asn1

@@ -4,7 +4,7 @@
 #   <file> <sha1sum of file (without line 4 which changes depending on the location of the files)> <patch to apply to file>
 
 RRC_Rel14=(
-  "SystemInformation-r8-IEs.h" 562e3c3aeb7c6d76d722f31bf24488a26e627f33 "fix_asn1.data/RRC.rel14/SystemInformation-r8-IEs.h.diff"
+  "SystemInformation-r8-IEs.h" 4df485c5ddf2540eca271876cdc512caa19b0890 "fix_asn1.data/RRC.rel14/SystemInformation-r8-IEs.h.diff"
 )
 
 RRC_Rel10=(

cmake_targets/tools/indent_source_code

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/init_exmimo2

@@ -5,7 +5,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/init_nas_nos1

@@ -5,7 +5,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/init_nas_s1

@@ -8,7 +8,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *
@@ -52,20 +52,20 @@ load_module ../../targets/bin/ue_ip.ko
 
 if [ "$1" = "UE" ]; then
   echo "bring up $LTEIF interface for UE"
-  ifconfig $LTEIF up
+ sudo ifconfig $LTEIF up
 fi
 
-ip route flush cache
+sudo ip route flush cache
 sleep 1
-sysctl -w net.ipv4.conf.all.log_martians=1
+sudo sysctl -w net.ipv4.conf.all.log_martians=1
 echo "Disabling reverse path filtering"
-sysctl -w net.ipv4.conf.all.rp_filter=0
-ip route flush cache
+sudo sysctl -w net.ipv4.conf.all.rp_filter=0
+sudo ip route flush cache
 
 # Check table 200 lte in /etc/iproute2/rt_tables
 fgrep lte /etc/iproute2/rt_tables  > /dev/null 
 if [ $? -ne 0 ]; then
     echo "200 lte " >> /etc/iproute2/rt_tables
 fi
-ip rule add fwmark 1 table lte
-ip route add default dev $LTEIF table lte
+sudo ip rule add fwmark 1 table lte
+sudo ip route add default dev $LTEIF table lte

cmake_targets/tools/perf_oai.bash

@@ -3,7 +3,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/run_enb_s1_exmimo

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/run_enb_s1_usrp

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/run_enb_ue_virt_noS1

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/run_enb_ue_virt_s1

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/stop_exmimo2

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

common/config/config_cmdline.c

@@ -0,0 +1,166 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file common/config/cmdline/config_libconfig.c
+ * \brief configuration module, command line parsing implementation 
+ * \author Francois TABURET
+ * \date 2017
+ * \version 0.1
+ * \company NOKIA BellLabs France
+ * \email: francois.taburet@nokia-bell-labs.com
+ * \note
+ * \warning
+ */
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include "config_userapi.h"
+
+int processoption(paramdef_t *cfgoptions, char *value)
+{
+char *tmpval = value;
+int optisset=0;
+char defbool[2]="1";
+
+     if ( value == NULL) {
+        if( (cfgoptions->paramflags &PARAMFLAG_BOOL) == 0 ) { /* not a boolean, argument required */
+	    fprintf(stderr,"[CONFIG] command line, option %s requires an argument\n",cfgoptions->optname);
+	    return 0;
+        } else {        /* boolean value option without argument, set value to true*/
+            tmpval = defbool;
+        }
+     }
+     switch(cfgoptions->type)
+       {
+       	case TYPE_STRING:
+           if (cfgoptions->numelt == 0 ) {
+              config_check_valptr(cfgoptions, cfgoptions->strptr, strlen(tmpval)+1);
+              sprintf(*(cfgoptions->strptr), "%s",tmpval);
+            } else {
+              sprintf( (char *)(cfgoptions->strptr), "%s",tmpval);              
+           }
+           printf_cmdl("[CONFIG] %s set to  %s from command line\n", cfgoptions->optname, tmpval);
+	   optisset=1;
+        break;
+	
+        case TYPE_STRINGLIST:
+        break;
+        case TYPE_UINT32:
+       	case TYPE_INT32:
+        case TYPE_UINT16:
+       	case TYPE_INT16:
+	case TYPE_UINT8:
+       	case TYPE_INT8:	
+           config_check_valptr(cfgoptions, (char **)&(cfgoptions->iptr),sizeof(int32_t));
+	   config_assign_int(cfgoptions,cfgoptions->optname,(int32_t)strtol(tmpval,NULL,0));  
+	   optisset=1;
+        break;  	
+       	case TYPE_UINT64:
+       	case TYPE_INT64:
+           config_check_valptr(cfgoptions, (char **)&(cfgoptions->i64ptr),sizeof(uint64_t));
+	   *(cfgoptions->i64ptr)=strtoll(tmpval,NULL,0);  
+           printf_cmdl("[CONFIG] %s set to  %lli from command line\n", cfgoptions->optname, (long long)*(cfgoptions->i64ptr));
+	   optisset=1;
+        break;        
+       	case TYPE_UINTARRAY:
+       	case TYPE_INTARRAY:
+
+        break;
+        case TYPE_DOUBLE:
+           config_check_valptr(cfgoptions, (char **)&(cfgoptions->dblptr),sizeof(double)); 
+           *(cfgoptions->dblptr) = strtof(tmpval,NULL);  
+           printf_cmdl("[CONFIG] %s set to  %lf from command line\n", cfgoptions->optname, *(cfgoptions->dblptr));
+	   optisset=1; 
+        break; 
+
+       	case TYPE_IPV4ADDR:
+
+        break;
+
+       default:
+            fprintf(stderr,"[CONFIG] command line, %s type %i  not supported\n",cfgoptions->optname, cfgoptions->type);
+       break;
+       } /* switch on param type */
+       if (optisset == 1) {
+          cfgoptions->paramflags = cfgoptions->paramflags |  PARAMFLAG_PARAMSET;
+       }
+       
+    return optisset;
+}
+
+int config_process_cmdline(paramdef_t *cfgoptions,int numoptions, char *prefix)
+{
+char **p = config_get_if()->argv;
+int c = config_get_if()->argc;
+int j;
+char *pp;
+char *cfgpath; 
+ 
+  j = (prefix ==NULL) ? 0 : strlen(prefix); 
+  cfgpath = malloc( j + MAX_OPTNAME_SIZE +1);
+  if (cfgpath == NULL) {
+     fprintf(stderr,"[CONFIG] %s %i malloc error,  %s\n", __FILE__, __LINE__,strerror(errno));
+     return -1;
+  }
+
+  j=0;
+  p++;
+  c--;
+    while (c > 0 && *p != NULL) {
+        if (strcmp(*p, "-h") == 0 || strcmp(*p, "--help") == 0 ) {
+            config_printhelp(cfgoptions,numoptions);
+        }
+
+        if (*p[0] == '-') {        
+    	    for(int i=0;i<numoptions;i++) {
+    		if ( ( cfgoptions[i].paramflags & PARAMFLAG_DISABLECMDLINE) != 0) {
+    		  continue;
+    		 }
+    		if (prefix != NULL) {
+    		   sprintf(cfgpath,"%s.%s",prefix,cfgoptions[i].optname);
+    		} else {
+    		   sprintf(cfgpath,"%s",cfgoptions[i].optname);
+    		}
+
+    		if ( ((strlen(*p) == 2) && (strcmp(*p + 1,cfgpath) == 0))  || 
+    		     ((strlen(*p) > 2) && (strcmp(*p + 2,cfgpath ) == 0 )) ) {
+    		   pp = *(p+1);
+    		   if ( ( pp != NULL ) && (c>1) &&  (pp[0]!= '-') ) {
+    		
+    		      j += processoption(&(cfgoptions[i]), pp);
+    		   } else {
+    		      j += processoption(&(cfgoptions[i]), NULL);
+    		   }
+                   break;
+    		}
+    	     } /* for */
+         } /* if (*p[0] == '-') */  	     
+   	 p++;
+         c--;  
+    }   /* fin du while */
+  printf_cmdl("[CONFIG] %s %i options set from command line\n",((prefix == NULL) ? "":prefix),j);
+  free(cfgpath);
+  return j;            
+}  /* parse_cmdline*/
+
+
+

common/config/config_load_configmodule.c

@@ -0,0 +1,227 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file common/config/config_load_configmodule.c
+ * \brief configuration module, load the shared library implementing the configuration module 
+ * \author Francois TABURET
+ * \date 2017
+ * \version 0.1
+ * \company NOKIA BellLabs France
+ * \email: francois.taburet@nokia-bell-labs.com
+ * \note
+ * \warning
+ */
+#define _GNU_SOURCE
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <dlfcn.h>
+
+#define CONFIG_LOADCONFIG_MAIN
+#include "config_load_configmodule.h"
+#include "config_userapi.h"
+#define CONFIG_SHAREDLIBFORMAT "libparams_%s.so"
+
+int load_config_sharedlib(configmodule_interface_t *cfgptr)
+{
+void *lib_handle;
+char fname[128];
+char libname[FILENAME_MAX]; 
+int st;
+
+   st=0;  
+   sprintf(libname,CONFIG_SHAREDLIBFORMAT,cfgptr->cfgmode);
+
+   lib_handle = dlopen(libname,RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE);
+   if (!lib_handle) {
+      fprintf(stderr,"[CONFIG] %s %d Error calling dlopen(%s): %s\n",__FILE__, __LINE__, libname,dlerror());
+      st = -1;
+   } else { 
+      sprintf (fname,"config_%s_init",cfgptr->cfgmode);
+      cfgptr->init = dlsym(lib_handle,fname);
+
+      if (cfgptr->init == NULL ) {
+         printf("[CONFIG] %s %d no function %s for config mode %s\n",
+               __FILE__, __LINE__,fname, cfgptr->cfgmode);
+      } else {
+         st=cfgptr->init(cfgptr->cfgP,cfgptr->num_cfgP); 
+         printf("[CONFIG] function %s returned %i\n",
+               fname, st);	 
+      }
+
+      sprintf (fname,"config_%s_get",cfgptr->cfgmode);
+      cfgptr->get = dlsym(lib_handle,fname);
+      if (cfgptr->get == NULL ) { 
+         printf("[CONFIG] %s %d no function %s for config mode %s\n",
+               __FILE__, __LINE__,fname, cfgptr->cfgmode);
+	 st = -1;
+      }
+      
+      sprintf (fname,"config_%s_getlist",cfgptr->cfgmode);
+      cfgptr->getlist = dlsym(lib_handle,fname);
+      if (cfgptr->getlist == NULL ) { 
+         printf("[CONFIG] %s %d no function %s for config mode %s\n",
+               __FILE__, __LINE__,fname, cfgptr->cfgmode);
+	 st = -1;
+      }
+
+      sprintf (fname,"config_%s_end",cfgptr->cfgmode);
+      cfgptr->end = dlsym(lib_handle,fname);
+      if (cfgptr->getlist == NULL ) { 
+         printf("[CONFIG] %s %d no function %s for config mode %s\n",
+               __FILE__, __LINE__,fname, cfgptr->cfgmode);
+      }      
+   } 
+   
+   return st;	       
+}
+/*-----------------------------------------------------------------------------------*/
+/* from here: interface implementtion of the configuration module */
+
+
+configmodule_interface_t *load_configmodule(int argc, char **argv)
+{
+char *cfgparam=NULL;
+char *modeparams=NULL;
+char *cfgmode=NULL;
+char *strtokctx=NULL;
+char *atoken;
+uint32_t tmpflags=0;
+int i;
+ 
+/* first parse the command line to look for the -O option */
+  opterr=0;
+  for (i = 0;i<argc;i++) {
+       if (strlen(argv[i]) < 2) continue;
+       if ( argv[i][1] == 'O' && i < (argc -1)) {
+          cfgparam = argv[i+1]; 
+       } 
+        if ( argv[i][1] == 'h' ) {
+          tmpflags = CONFIG_HELP; 
+       }            
+   }
+   optind=1;
+
+/* look for the OAI_CONFIGMODULE environement variable */
+  if ( cfgparam == NULL ) {
+     cfgparam = getenv("OAI_CONFIGMODULE");
+     }
+
+/* default */
+  if (cfgparam == NULL) {
+     tmpflags = tmpflags | CONFIG_NOOOPT;
+     cfgparam = DEFAULT_CFGMODE ":" DEFAULT_CFGFILENAME;
+     }
+/* parse the config parameters to set the config source */
+   i = sscanf(cfgparam,"%m[^':']:%ms",&cfgmode,&modeparams);
+   if (i< 0) {
+       fprintf(stderr,"[CONFIG] %s, %d, sscanf error parsing config source  %s: %s\n", __FILE__, __LINE__,cfgparam, strerror(errno));
+       cfgmode=strdup(DEFAULT_CFGMODE);
+       modeparams = strdup(DEFAULT_CFGFILENAME);
+   }
+   else if ( i == 1 ) {
+  /* -O argument doesn't contain ":" separator, assume -O <conf file> option, default cfgmode to libconfig
+     with one parameter, the path to the configuration file */
+       modeparams=cfgmode;
+       cfgmode=strdup(DEFAULT_CFGMODE);
+   }
+
+   cfgptr = malloc(sizeof(configmodule_interface_t));
+   memset(cfgptr,0,sizeof(configmodule_interface_t));
+
+   cfgptr->rtflags = cfgptr->rtflags | tmpflags;
+   cfgptr->argc   = argc;
+   cfgptr->argv   = argv; 
+   cfgptr->cfgmode=strdup(cfgmode);
+
+   cfgptr->num_cfgP=0;
+   atoken=strtok_r(modeparams,":",&strtokctx);     
+   while ( cfgptr->num_cfgP< CONFIG_MAX_OOPT_PARAMS && atoken != NULL) {
+       /* look for debug level in the config parameters, it is commom to all config mode 
+          and will be removed frome the parameter array passed to the shared module */
+       char *aptr;
+       aptr=strcasestr(atoken,"dbgl");
+       if (aptr != NULL) {
+           cfgptr->rtflags = cfgptr->rtflags | strtol(aptr+4,NULL,0);
+
+       } else {
+           cfgptr->cfgP[cfgptr->num_cfgP] = strdup(atoken);
+           cfgptr->num_cfgP++;
+       }
+       atoken = strtok_r(NULL,":",&strtokctx);
+   }
+
+   
+   printf("[CONFIG] get parameters from %s ",cfgmode);
+   for (i=0;i<cfgptr->num_cfgP; i++) {
+        printf("%s ",cfgptr->cfgP[i]); 
+   }
+   printf("\n");
+
+ 
+   i=load_config_sharedlib(cfgptr);
+   if (i< 0) {
+      fprintf(stderr,"[CONFIG] %s %d config module %s couldn't be loaded\n", __FILE__, __LINE__,cfgmode);
+      cfgptr->rtflags = cfgptr->rtflags | CONFIG_HELP | CONFIG_ABORT;
+   } else {
+      printf("[CONFIG] config module %s loaded\n",cfgmode);
+      Config_Params[CONFIGPARAM_DEBUGFLAGS_IDX].uptr=&(cfgptr->rtflags);
+      config_get(Config_Params,CONFIG_PARAMLENGTH(Config_Params), CONFIG_SECTIONNAME ); 
+   }
+
+  
+
+   if (modeparams != NULL) free(modeparams);
+   if (cfgmode != NULL) free(cfgmode);
+   if (CONFIG_ISFLAGSET(CONFIG_ABORT)) config_printhelp(Config_Params,CONFIG_PARAMLENGTH(Config_Params));
+   return cfgptr;
+}
+
+void end_configmodule()
+{ 
+  if (cfgptr != NULL) {
+      if (cfgptr->end != NULL) {
+         printf ("[CONFIG] calling config module end function...\n"); 
+         cfgptr->end();
+      }
+      if( cfgptr->cfgmode != NULL) free(cfgptr->cfgmode);
+      printf ("[CONFIG] free %u config parameter pointers\n",cfgptr->num_cfgP);  
+      for (int i=0; i<cfgptr->num_cfgP; i++) {
+          if ( cfgptr->cfgP[i] != NULL) free(cfgptr->cfgP[i]);
+          }
+      printf ("[CONFIG] free %u config value pointers\n",cfgptr->numptrs);  
+      for(int i=0; i<cfgptr->numptrs ; i++) {
+          if (cfgptr->ptrs[i] != NULL) {
+             free(cfgptr->ptrs[i]);
+          }
+          cfgptr->ptrs[i]=NULL;
+      }
+
+  free(cfgptr);
+  cfgptr=NULL;
+  }
+}
+
+
+
+

common/config/config_load_configmodule.h

@@ -0,0 +1,104 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file common/config/config_load_configmodule.h
+ * \brief: configuration module, include file to be used by the source code calling the 
+ *  configuration module initialization 
+ * \author Francois TABURET
+ * \date 2017
+ * \version 0.1
+ * \company NOKIA BellLabs France
+ * \email: francois.taburet@nokia-bell-labs.com
+ * \note
+ * \warning
+ */
+#ifndef INCLUDE_CONFIG_LOADCONFIGMODULE_H
+#define INCLUDE_CONFIG_LOADCONFIGMODULE_H 
+
+
+#include <string.h>
+#include <stdlib.h>
+#include "common/config/config_paramdesc.h"
+#define CONFIG_MAX_OOPT_PARAMS    10     // maximum number of parameters in the -O option (-O <cfgmode>:P1:P2...
+#define CONFIG_MAX_ALLOCATEDPTRS  1024   // maximum number of parameters that can be dynamicaly allocated in the config module
+
+/* rtflags bit position definitions */
+#define CONFIG_PRINTPARAMS    1        // print parameters values while processing
+#define CONFIG_DEBUGPTR       2        // print memory allocation/free debug messages
+#define CONFIG_DEBUGCMDLINE   4        // print command line processing messages
+#define CONFIG_HELP           8        // print help message
+#define CONFIG_ABORT          16       // config failed,abort execution 
+#define CONFIG_NOOOPT         32       // no -O option found when parsing command line 
+
+
+typedef int(*configmodule_initfunc_t)(char *cfgP[],int numP);
+typedef int(*configmodule_getfunc_t)(paramdef_t *,int numparams, char *prefix);
+typedef int(*configmodule_getlistfunc_t)(paramlist_def_t *, paramdef_t *,int numparams, char *prefix);
+typedef void(*configmodule_endfunc_t)(void);
+typedef struct configmodule_interface
+{
+  int      argc;
+  char     **argv;
+  char     *cfgmode;
+  int      num_cfgP;
+  char     *cfgP[CONFIG_MAX_OOPT_PARAMS];
+  configmodule_initfunc_t         init;
+  configmodule_getfunc_t          get;
+  configmodule_getlistfunc_t      getlist;
+  configmodule_endfunc_t          end;
+  uint32_t numptrs;
+  uint32_t rtflags;
+  char     *ptrs[CONFIG_MAX_ALLOCATEDPTRS];  
+} configmodule_interface_t;
+
+#ifdef CONFIG_LOADCONFIG_MAIN
+configmodule_interface_t *cfgptr=NULL;
+
+static char config_helpstr [] = "\n lte-softmodem -O [config mode]<:dbg[debugflags]> \n \
+          debugflags can also be defined in the config_libconfig section of the config file\n \
+          debugflags: mask,    1->print parameters, 2->print memory allocations debug messages\n \
+                               4->print command line processing debug messages\n ";
+			       
+#define CONFIG_SECTIONNAME "config"
+#define CONFIGPARAM_DEBUGFLAGS_IDX        0
+
+
+static paramdef_t Config_Params[] = {
+/*-----------------------------------------------------------------------------------------------------------------------*/
+/*                                            config parameters for config module                                        */
+/*   optname              helpstr           paramflags     XXXptr       defXXXval            type       numelt           */
+/*-----------------------------------------------------------------------------------------------------------------------*/
+{"debugflags",            config_helpstr,   0,             uptr:NULL,   defintval:0,        TYPE_MASK,  0}, 
+};
+
+#else
+extern configmodule_interface_t *cfgptr;
+#endif
+
+
+#define printf_params(...) if ( (cfgptr->rtflags & CONFIG_PRINTPARAMS) != 0 )  { printf ( __VA_ARGS__ ); }
+#define printf_ptrs(...)   if ( (cfgptr->rtflags & CONFIG_DEBUGPTR) != 0 )     { printf ( __VA_ARGS__ ); }     
+#define printf_cmdl(...)   if ( (cfgptr->rtflags & CONFIG_DEBUGCMDLINE) != 0 ) { printf ( __VA_ARGS__ ); }
+ 
+extern configmodule_interface_t *load_configmodule(int argc, char **argv);
+extern void end_configmodule(void);
+
+#endif  /* INCLUDE_CONFIG_LOADCONFIGMODULE_H */

common/config/config_paramdesc.h

@@ -0,0 +1,120 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file common/config/config_paramdesc.h
+ * \brief configuration module, include file describing parameters, common to all implementations
+ * \author Francois TABURET
+ * \date 2017
+ * \version 0.1
+ * \company NOKIA BellLabs France
+ * \email: francois.taburet@nokia-bell-labs.com
+ * \note
+ * \warning
+ */
+#include <stdint.h>
+#ifndef INCLUDE_CONFIG_PARAMDESC_H
+#define INCLUDE_CONFIG_PARAMDESC_H
+
+
+
+
+
+#define MAX_OPTNAME_SIZE 64
+
+
+
+/* parameter flags definitions */
+/*   Flags to be used by calling modules in their parameters definitions to modify  config module behavior*/
+#define PARAMFLAG_MANDATORY               (1 << 0)         // parameter must be explicitely set, default value ignored
+#define PARAMFLAG_DISABLECMDLINE          (1 << 1)         // parameter cannot bet set from comand line
+#define PARAMFLAG_DONOTREAD               (1 << 2)         // parameter must be ignored in get function
+#define PARAMFLAG_NOFREE                  (1 << 3)         // don't free parameter in end function
+#define PARAMFLAG_BOOL                    (1 << 4)         // integer param can be 0 or 1
+
+
+/*   Flags used by config modules to return info to calling modules and/or to  for internal usage*/
+#define PARAMFLAG_MALLOCINCONFIG          (1 << 15)        // parameter allocated in config module
+#define PARAMFLAG_PARAMSET                (1 << 16)        // parameter has been explicitely set in get functions
+#define PARAMFLAG_PARAMSETDEF             (1 << 17)        // parameter has been set to default value in get functions
+
+typedef struct paramdef
+{
+   char optname[MAX_OPTNAME_SIZE];        /* parameter name, can be used as long command line option */
+   char *helpstr;                         /* help string */
+   unsigned int paramflags;               /* value is a "ored" combination of above PARAMFLAG_XXXX values */
+   union {                                /* pointer to the parameter value, completed by the config module */
+     char **strptr;
+     char **strlistptr;
+     uint8_t   *u8ptr;
+     char      *i8ptr;     
+     uint16_t  *u16ptr;
+     int16_t   *i16ptr;
+     uint32_t  *uptr;
+     int32_t   *iptr;
+     uint64_t  *u64ptr;
+     int64_t   *i64ptr;
+     double    *dblptr;
+     } ;
+   union {                                /* default parameter value, to be used when PARAMFLAG_MANDATORY is not specified */
+     char *defstrval;
+     char **defstrlistval;
+     uint32_t defuintval;
+     int defintval;
+     uint64_t defint64val;
+     int *defintarrayval;
+     double defdblval;
+     } ;   
+   char type;                              /* parameter value type, as listed below as TYPE_XXXX macro */
+   int numelt;                             /* number of elements in a list or array parameters or max size of string value */ 
+} paramdef_t;
+
+#define TYPE_INT        TYPE_INT32
+#define TYPE_UINT       TYPE_UINT32
+#define TYPE_STRING     1
+#define TYPE_INT8       2
+#define TYPE_UINT8      3
+#define TYPE_INT16      4
+#define TYPE_UINT16     5
+#define TYPE_INT32      6
+#define TYPE_UINT32     7
+#define TYPE_INT64      8
+#define TYPE_UINT64     9
+#define TYPE_MASK       10
+#define TYPE_DOUBLE     16
+#define TYPE_IPV4ADDR   20
+
+
+#define TYPE_STRINGLIST 50
+#define TYPE_INTARRAY   51
+#define TYPE_UINTARRAY  52
+#define TYPE_LIST       55
+
+#define ANY_IPV4ADDR_STRING "0.0.0.0"
+
+typedef struct paramlist_def {
+    char listname[MAX_OPTNAME_SIZE];
+    paramdef_t **paramarray;
+    int numelt ;
+} paramlist_def_t;
+
+/* macro helpers for module users */
+#define CONFIG_PARAMLENGTH(A)    (sizeof(A)/sizeof(paramdef_t))
+#endif  /* INCLUDE_CONFIG_PARAMDESC_H */

common/config/config_userapi.c

@@ -0,0 +1,157 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file common/config/config_userapi.c
+ * \brief configuration module, api implementation to access configuration parameters
+ * \author Francois TABURET
+ * \date 2017
+ * \version 0.1
+ * \company NOKIA BellLabs France
+ * \email: francois.taburet@nokia-bell-labs.com
+ * \note
+ * \warning
+ */
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <dlfcn.h>
+#include "config_userapi.h"
+
+
+configmodule_interface_t *config_get_if(void)
+{
+    if (cfgptr == NULL) {
+        fprintf(stderr,"[CONFIG] %s %d config module not initialized\n",__FILE__, __LINE__);
+	exit(-1);
+    }
+    return cfgptr;
+}
+
+char * config_check_valptr(paramdef_t *cfgoptions, char **ptr, int length) 
+{
+
+     printf_ptrs("[CONFIG] %s ptr: 0x%08lx requested size: %i\n",cfgoptions->optname,(uintptr_t)(ptr),length);
+     if(cfgoptions->numelt > 0) { /* already allocated */
+          return *ptr;
+     }
+
+     if (*ptr == NULL) {
+        *ptr = malloc(length);
+        if ( *ptr != NULL) {
+             memset(*ptr,0,length);
+             if ( (cfgoptions->paramflags & PARAMFLAG_NOFREE) != 0) {
+                 config_get_if()->ptrs[config_get_if()->numptrs] = *ptr;
+                 config_get_if()->numptrs++;
+             }
+        } else {
+             fprintf (stderr,"[CONFIG] %s %d malloc error\n",__FILE__, __LINE__);
+             exit(-1);
+        }       
+     }
+     return *ptr;
+}
+
+void config_assign_int(paramdef_t *cfgoptions, char *fullname, int val)
+{
+int tmpval=val;
+  if ( ((cfgoptions->paramflags &PARAMFLAG_BOOL) != 0) && tmpval >1) {
+      tmpval =1;
+  }
+  switch (cfgoptions->type) {
+       	case TYPE_UINT8:
+	     *(cfgoptions->u8ptr) = (uint8_t)tmpval;
+	     printf_params("[CONFIG] %s: %u\n", fullname, (uint8_t)tmpval);
+	break;
+       	case TYPE_INT8:
+	     *(cfgoptions->i8ptr) = (int8_t)tmpval;
+	     printf_params("[CONFIG] %s: %i\n", fullname, (int8_t)tmpval);
+	break;		
+       	case TYPE_UINT16:
+	     *(cfgoptions->u16ptr) = (uint16_t)tmpval;
+	     printf_params("[CONFIG] %s: %hu\n", fullname, (uint16_t)tmpval);     
+	break;
+       	case TYPE_INT16:
+	     *(cfgoptions->i16ptr) = (int16_t)tmpval;
+	     printf_params("[CONFIG] %s: %hi\n", fullname, (int16_t)tmpval);
+	break;	
+       	case TYPE_UINT32:
+	     *(cfgoptions->uptr) = (uint32_t)tmpval;
+	     printf_params("[CONFIG] %s: %u\n", fullname, (uint32_t)tmpval);
+	break;
+       	case TYPE_MASK:
+	     *(cfgoptions->uptr) = *(cfgoptions->uptr) | (uint32_t)tmpval;
+	     printf_params("[CONFIG] %s: 0x%08x\n", fullname, (uint32_t)tmpval);
+	break;
+       	case TYPE_INT32:
+	     *(cfgoptions->iptr) = (int32_t)tmpval;
+	     printf_params("[CONFIG] %s: %i\n", fullname, (int32_t)tmpval);
+	break;	
+	default:
+	     fprintf (stderr,"[CONFIG] %s %i type %i non integer parameter %s not assigned\n",__FILE__, __LINE__,cfgoptions->type,fullname);
+	break;
+  }
+}
+
+void config_printhelp(paramdef_t *params,int numparams)
+{
+   for (int i=0 ; i<numparams ; i++) {
+       if ( params[i].helpstr != NULL) {
+           printf("%s%s: %s",
+	           (strlen(params[i].optname) <= 1) ? "-" : "--", 
+	           params[i].optname,
+	           params[i].helpstr);
+       }
+   }
+}
+
+int config_get(paramdef_t *params,int numparams, char *prefix)
+{
+int ret= -1;
+
+if (CONFIG_ISFLAGSET(CONFIG_ABORT)) {
+    fprintf(stderr,"[CONFIG] config_get skipped, config module not properly initialized\n");
+    return ret;
+}
+configmodule_interface_t *cfgif = config_get_if();
+  if (cfgif != NULL) {
+      ret = config_get_if()->get(params, numparams,prefix);
+      if (ret >= 0) {
+         config_process_cmdline(params,numparams,prefix);
+     }
+  return ret;
+  }
+return ret;
+}
+
+int config_isparamset(paramdef_t *params,int paramidx)
+{
+  if ((params[paramidx].paramflags & PARAMFLAG_PARAMSET) != 0) {
+      return 1;
+  } else {
+      return 0;
+  }
+}
+
+int config_getparamval_fromparamdefidx(paramdef_t *cfgoptions,int paramidx) {
+    return -1;
+}

common/config/config_userapi.h

@@ -0,0 +1,65 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file common/config/config_userapi.h
+ * \brief: configuration module, include file to be used by the source code calling the 
+ *  configuration module to access configuration parameters
+ * \author Francois TABURET
+ * \date 2017
+ * \version 0.1
+ * \company NOKIA BellLabs France
+ * \email: francois.taburet@nokia-bell-labs.com
+ * \note
+ * \warning
+ */
+#ifndef INCLUDE_CONFIG_USERAPI_H
+#define INCLUDE_CONFIG_USERAPI_H 
+#include "config_load_configmodule.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+#define DEFAULT_CFGFILENAME "oaisoftmodem.conf"
+#define DEFAULT_CFGMODE     "libconfig"
+
+#define CONFIG_GETSOURCE    ( (config_get_if()==NULL) ? NULL : config_get_if()->cfgmode       )
+#define CONFIG_GETNUMP      ( (config_get_if()==NULL) ? 0    : config_get_if()->num_cfgP      )
+#define CONFIG_GETP(P)      ( (config_get_if()==NULL) ? NULL : config_get_if()->cfgP[P]       )
+#define CONFIG_ISFLAGSET(P) ( (config_get_if()==NULL) ? 0    : !!(config_get_if()->rtflags & P))
+
+extern configmodule_interface_t *config_get_if(void);
+extern char * config_check_valptr(paramdef_t *cfgoptions, char **ptr, int length) ;
+extern void config_printhelp(paramdef_t *,int numparams);
+extern int config_process_cmdline(paramdef_t *params,int numparams, char *prefix);
+extern int config_get(paramdef_t *params,int numparams, char *prefix);
+extern int config_isparamset(paramdef_t *params,int paramidx);
+extern void config_assign_int(paramdef_t *cfgoptions, char *fullname, int val);
+extern int config_process_cmdline(paramdef_t *cfgoptions,int numoptions, char *prefix);
+extern int config_getparamval_fromparamdefidx(paramdef_t *cfgoptions,int paramidx);
+#define config_getlist config_get_if()->getlist
+#define CONFIG_GETCONFFILE (config_get_if()->cfgP[0])
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

common/config/libconfig/config_libconfig.c

@@ -0,0 +1,379 @@
+#define _GNU_SOURCE
+#include <libconfig.h>
+
+#include <string.h>
+#include <stdlib.h>
+
+#include <arpa/inet.h>
+
+#include "config_libconfig.h"
+#include "config_libconfig_private.h"
+#include "../config_userapi.h"
+#include "errno.h"
+
+#if ( LIBCONFIG_VER_MAJOR == 1 && LIBCONFIG_VER_MINOR < 5)
+#define config_setting_lookup config_lookup_from
+#endif
+
+void config_libconfig_end(void );
+
+int read_strlist(paramdef_t *cfgoptions,config_setting_t *setting, char *cfgpath)
+{
+const char *str;
+int st;
+
+   cfgoptions->numelt=config_setting_length(setting);
+   cfgoptions->strlistptr=malloc(sizeof(char *) * (cfgoptions->numelt));
+   st=0;
+   for (int i=0; i< cfgoptions->numelt && cfgoptions->strlistptr != NULL; i++) {
+       str=config_setting_get_string_elem(setting,i);
+       if (str==NULL) {
+          printf("[LIBCONFIG] %s%i  not found in config file\n", cfgoptions->optname,i);
+       } else {
+            cfgoptions->strlistptr[i]=malloc(strlen(str)+1);
+            sprintf(cfgoptions->strlistptr[i],"%s",str);
+	    st++;
+            printf_params("[LIBCONFIG] %s%i: %s\n", cfgpath,i,cfgoptions->strlistptr[i]);
+       }
+   }
+   return st;
+}
+
+int read_intarray(paramdef_t *cfgoptions,config_setting_t *setting, char *cfgpath)
+{
+
+   cfgoptions->numelt=config_setting_length(setting);
+   
+   if (cfgoptions->numelt > 0) {
+       cfgoptions->iptr=malloc(sizeof(int) * (cfgoptions->numelt));
+       for (int i=0; i< cfgoptions->numelt && cfgoptions->iptr != NULL; i++) {
+            cfgoptions->iptr[i]=config_setting_get_int_elem(setting,i);
+            printf_params("[LIBCONFIG] %s[%i]: %i\n", cfgpath,i,cfgoptions->iptr[i]);
+       } /* for loop on array element... */
+   }
+   return cfgoptions->numelt;
+}
+
+
+
+
+int config_libconfig_get(paramdef_t *cfgoptions,int numoptions, char *prefix )
+{
+
+
+  config_setting_t *setting;
+  char *str;
+  int i,u;
+  long long int llu;
+  double dbl; 
+  int rst;
+  int status=0;
+  int notfound;
+  int defval;
+  int fatalerror=0;
+  char *cfgpath; /* listname.[listindex].paramname */
+  int numdefvals=0;
+  
+  i = (prefix ==NULL) ? 0 : strlen(prefix); 
+  cfgpath = malloc( i+ MAX_OPTNAME_SIZE +1);
+  if (cfgpath == NULL) {
+     fprintf(stderr,"[LIBCONFIG] %s %i malloc error,  %s\n", __FILE__, __LINE__,strerror(errno));
+     return -1;
+  }
+  for(i=0;i<numoptions;i++) {
+
+     if (prefix != NULL) {
+         sprintf(cfgpath,"%s.%s",prefix,cfgoptions[i].optname);
+     } else {
+         sprintf(cfgpath,"%s",cfgoptions[i].optname);
+     }
+
+     if( (cfgoptions->paramflags & PARAMFLAG_DONOTREAD) != 0) {
+         printf_params("[LIBCONFIG] %s.%s ignored\n", cfgpath,cfgoptions[i].optname );
+         continue;
+     }
+     notfound=0;
+     defval=0;
+     switch(cfgoptions[i].type)
+       {
+       	case TYPE_STRING:
+           
+           if ( config_lookup_string(&(libconfig_privdata.cfg),cfgpath, (const char **)&str)) {
+              if ( cfgoptions[i].numelt > 0  && str != NULL && strlen(str) >= cfgoptions[i].numelt ) {
+                  fprintf(stderr,"[LIBCONFIG] %s:  %s exceeds maximum length of %i bytes, value truncated\n",
+                           cfgpath,str,cfgoptions[i].numelt); 
+                  str[strlen(str)-1] = 0;
+              }
+              if (cfgoptions[i].numelt == 0 ) {
+                  config_check_valptr(&(cfgoptions[i]), (char **)(&(cfgoptions[i].strptr)), sizeof(char *));
+                  config_check_valptr(&(cfgoptions[i]), cfgoptions[i].strptr, strlen(str)+1);
+                  sprintf( *(cfgoptions[i].strptr) , "%s", str);
+                  printf_params("[LIBCONFIG] %s: %s\n", cfgpath,*(cfgoptions[i].strptr) );
+              } else {
+                 sprintf( (char *)(cfgoptions[i].strptr) , "%s", str);
+                 printf_params("[LIBCONFIG] %s: %s\n", cfgpath,(char *)cfgoptions[i].strptr );
+              }
+           } else {
+	      if( cfgoptions[i].defstrval != NULL) {
+                 defval=1;
+ 
+                 if (cfgoptions[i].numelt == 0 ) {
+                     config_check_valptr(&(cfgoptions[i]), (char **)(&(cfgoptions[i].strptr)), sizeof(char *));
+                     config_check_valptr(&(cfgoptions[i]), cfgoptions[i].strptr, strlen(cfgoptions[i].defstrval)+1);
+                     sprintf(*(cfgoptions[i].strptr), "%s",cfgoptions[i].defstrval);
+                     printf_params("[LIBCONFIG] %s set to default value %s\n", cfgpath, *(cfgoptions[i].strptr));
+                 } else {
+                    sprintf((char *)(cfgoptions[i].strptr), "%s",cfgoptions[i].defstrval);
+                    printf_params("[LIBCONFIG] %s set to default value %s\n", cfgpath, (char *)cfgoptions[i].strptr);
+                 }
+              } else {
+	         notfound=1;
+              } 
+	   }
+       break;
+       	case TYPE_STRINGLIST:
+	   setting = config_setting_lookup (config_root_setting(&(libconfig_privdata.cfg)),cfgpath );
+           if ( setting != NULL) {
+              read_strlist(&cfgoptions[i],setting,cfgpath);
+           } else {
+              if( cfgoptions[i].defstrlistval != NULL) {
+                  cfgoptions[i].strlistptr=cfgoptions[i].defstrlistval;
+                  defval=1;
+		for(int j=0; j<cfgoptions[i].numelt; j++)
+                     printf_params("[LIBCONFIG] %s%i set to default value %s\n", cfgpath,j, cfgoptions[i].strlistptr[j]);
+              } else {
+                notfound=1;
+              }
+	   }
+       break;
+       	case TYPE_UINT8:
+       	case TYPE_INT8:	
+       	case TYPE_UINT16:
+       	case TYPE_INT16:
+       	case TYPE_UINT32:
+       	case TYPE_INT32:
+       	case TYPE_MASK:	
+           config_check_valptr(&(cfgoptions[i]), (char **)(&(cfgoptions[i].iptr)),sizeof(int32_t));
+           if ( config_lookup_int(&(libconfig_privdata.cfg),cfgpath, &u)) {
+	      config_assign_int(&(cfgoptions[i]),cfgpath,u);
+           } else {
+	      if( ((cfgoptions[i].paramflags & PARAMFLAG_MANDATORY) == 0)) {
+                 config_assign_int(&(cfgoptions[i]),cfgpath,cfgoptions[i].defintval);
+                 defval=1;
+                 printf_params("[LIBCONFIG] %s set to default value\n", cfgpath);
+              } else {
+	         notfound=1;
+              }
+	   }	      
+        break;
+       	case TYPE_UINT64:
+       	case TYPE_INT64:
+           config_check_valptr(&(cfgoptions[i]), (char **)&(cfgoptions[i].i64ptr),sizeof(long long));
+           if ( config_lookup_int64(&(libconfig_privdata.cfg),cfgpath, &llu)) {
+              if(cfgoptions[i].type==TYPE_UINT64) {
+                 *(cfgoptions[i].u64ptr) = (uint64_t)llu;
+                 printf_params("[LIBCONFIG] %s: %llu\n", cfgpath,(long long unsigned)(*(cfgoptions[i].u64ptr)) );
+              } else {
+                 *(cfgoptions[i].iptr) = llu;
+                 printf_params("[LIBCONFIG] %s: %lli\n", cfgpath,(long long unsigned)(*(cfgoptions[i].i64ptr)) ); 
+              }
+           } else {
+	      if( ((cfgoptions[i].paramflags & PARAMFLAG_MANDATORY) == 0)) {
+                 *(cfgoptions[i].u64ptr)=cfgoptions[i].defuintval;
+                 defval=1;
+                 printf_params("[LIBCONFIG] %s set to default value %llu\n", cfgpath, (long long unsigned)(*(cfgoptions[i].u64ptr)));
+              } else {
+	         notfound=1;
+              }
+	   }	      
+        break;        
+       	case TYPE_UINTARRAY:
+       	case TYPE_INTARRAY:
+	   setting = config_setting_lookup (config_root_setting(&(libconfig_privdata.cfg)),cfgpath );
+           if ( setting != NULL) {
+              read_intarray(&cfgoptions[i],setting,cfgpath);
+           } else {
+              if( cfgoptions[i].defintarrayval != NULL) {
+                config_check_valptr(&(cfgoptions[i]),(char **)&(cfgoptions[i].iptr), sizeof(int32_t*));
+                cfgoptions[i].iptr=cfgoptions[i].defintarrayval;
+                defval=1;
+                for (int j=0; j<cfgoptions[i].numelt ; j++) {
+                    printf_params("[LIBCONFIG] %s[%i] set to default value %i\n", cfgpath,j,(int)cfgoptions[i].iptr[j]);
+                }
+              } else {
+                notfound=1;
+              }
+	   }    
+        break;
+       	case TYPE_DOUBLE:
+           config_check_valptr(&(cfgoptions[i]), (char **)&(cfgoptions[i].dblptr),sizeof(double));
+           if ( config_lookup_float(&(libconfig_privdata.cfg),cfgpath, &dbl)) {
+                 *(cfgoptions[i].dblptr) = dbl;
+                 printf_params("[LIBCONFIG] %s: %lf\n", cfgpath,*(cfgoptions[i].dblptr) );
+           } else {
+	      if( ((cfgoptions[i].paramflags & PARAMFLAG_MANDATORY) == 0)) {
+                 *(cfgoptions[i].u64ptr)=cfgoptions[i].defdblval;
+                 defval=1;
+                 printf_params("[LIBCONFIG] %s set to default value %lf\n", cfgpath, *(cfgoptions[i].dblptr));
+              } else {
+	         notfound=1;
+              }
+	   }	      
+        break;  
+       	case TYPE_IPV4ADDR:
+           config_check_valptr(&(cfgoptions[i]),(char **)&(cfgoptions[i].uptr), sizeof(int));
+           if ( !config_lookup_string(&(libconfig_privdata.cfg),cfgpath, (const char **)&str)) {
+	      str=cfgoptions[i].defstrval;
+              defval=1;
+	      printf_params("[LIBCONFIG] %s set to default value %s\n", cfgpath, str);
+	   }
+	   if (str != NULL) {
+              rst=inet_pton(AF_INET, str,cfgoptions[i].uptr );
+	      if (rst == 1 && *(cfgoptions[i].uptr) > 0) {
+                 printf_params("[LIBCONFIG] %s: %s\n", cfgpath,str );
+              } else {
+		 if ( strncmp(str,ANY_IPV4ADDR_STRING,sizeof(ANY_IPV4ADDR_STRING)) == 0) {
+		    printf_params("[LIBCONFIG] %s:%s (INADDR_ANY) \n",cfgpath,str);
+		    *cfgoptions[i].uptr=INADDR_ANY;
+		 } else {
+		    fprintf(stderr,"[LIBCONFIG] %s not valid for %s \n", str, cfgpath);
+                    fatalerror=1;
+                 }
+              }
+           } else {
+	      notfound=1;
+	   }
+              
+        break;
+       	case TYPE_LIST:
+	   setting = config_setting_lookup (config_root_setting(&(libconfig_privdata.cfg)),cfgpath );
+           if ( setting) {
+              cfgoptions[i].numelt=config_setting_length(setting);
+           } else {
+              notfound=1;
+	   }
+       break;
+       default:
+            fprintf(stderr,"[LIBCONFIG] %s type %i  not supported\n", cfgpath,cfgoptions[i].type);
+            fatalerror=1;
+       break;
+       } /* switch on param type */
+    if( notfound == 1) {
+        printf("[LIBCONFIG] %s not found in %s ", cfgpath,libconfig_privdata.configfile );
+        if ( (cfgoptions[i].paramflags & PARAMFLAG_MANDATORY) != 0) {
+            fatalerror=1;
+            printf("  mandatory parameter missing\n");
+        } else {
+           printf("\n");
+        }
+    } else {
+      if (defval == 1) {
+          numdefvals++;
+	  cfgoptions[i].paramflags = cfgoptions[i].paramflags |  PARAMFLAG_PARAMSETDEF;
+      } else {
+          cfgoptions[i].paramflags = cfgoptions[i].paramflags |  PARAMFLAG_PARAMSET;
+      }
+      status++;
+    }
+  } /* for loop on options */
+  printf("[LIBCONFIG] %s: %i/%i parameters successfully set, (%i to default value)\n",
+         ((prefix == NULL)?"(root)":prefix), 
+         status,numoptions,numdefvals );
+  if (fatalerror == 1) {
+      fprintf(stderr,"[LIBCONFIG] fatal errors found when processing  %s \n", libconfig_privdata.configfile );
+      config_libconfig_end();
+      end_configmodule();
+  }
+  free(cfgpath);
+  return status;
+}
+
+int config_libconfig_getlist(paramlist_def_t *ParamList, 
+                                   paramdef_t *params, int numparams, char *prefix)
+{
+config_setting_t *setting;
+int i,j,status;
+char *listpath=NULL;
+char cfgpath[MAX_OPTNAME_SIZE*2 + 6]; /* prefix.listname.[listindex] */
+
+    if (prefix != NULL)
+        {
+        i=asprintf(&listpath ,"%s.%s",prefix,ParamList->listname);
+        }
+    else
+        {
+        i=asprintf(&listpath ,"%s",ParamList->listname);
+        }
+    setting = config_lookup(&(libconfig_privdata.cfg), listpath);
+    if ( setting) {
+        status = ParamList->numelt = config_setting_length(setting);
+        printf_params("[LIBCONFIG] %i %s in config file %s \n", 
+               ParamList->numelt,listpath,libconfig_privdata.configfile );
+    } else {
+        printf("[LIBCONFIG] list %s not found in config file %s \n", 
+               listpath,libconfig_privdata.configfile );
+        ParamList->numelt= 0;
+        status = -1;
+    }
+    if (ParamList->numelt > 0 && params != NULL) {
+        ParamList->paramarray = malloc(ParamList->numelt * sizeof(paramdef_t *));
+        if ( ParamList->paramarray != NULL) {
+             config_get_if()->ptrs[config_get_if()->numptrs] = (char *)(ParamList->paramarray); 
+             config_get_if()->numptrs++;
+        } else {
+             fprintf (stderr,"[LIBCONFIG] %s %d malloc error\n",__FILE__, __LINE__);
+             exit(-1);
+        }
+        for (i=0 ; i < ParamList->numelt ; i++) {
+            ParamList->paramarray[i] = malloc(numparams * sizeof(paramdef_t));
+            if ( ParamList->paramarray[i] != NULL) {
+                 config_get_if()->ptrs[config_get_if()->numptrs] = (char *)(ParamList->paramarray[i]); 
+                 config_get_if()->numptrs++;
+            } else {
+                 fprintf (stderr,"[LIBCONFIG] %s %d malloc error\n",__FILE__, __LINE__);
+                 exit(-1);
+            }
+            
+            memcpy(ParamList->paramarray[i], params, sizeof(paramdef_t)*numparams);
+            for (j=0;j<numparams;j++) {
+                ParamList->paramarray[i][j].strptr = NULL ;
+                } 
+            sprintf(cfgpath,"%s.[%i]",listpath,i);
+            config_libconfig_get(ParamList->paramarray[i], numparams, cfgpath );
+        } /* for i... */
+    } /* ParamList->numelt > 0 && params != NULL */
+    if (listpath != NULL)
+        free(listpath);
+    return status;
+}
+
+int config_libconfig_init(char *cfgP[], int numP)
+{
+  config_init(&(libconfig_privdata.cfg));
+  libconfig_privdata.configfile = strdup((char *)cfgP[0]);
+  config_get_if()->numptrs=0;
+  memset(config_get_if()->ptrs,0,sizeof(void *) * CONFIG_MAX_ALLOCATEDPTRS);
+
+  /* Read the file. If there is an error, report it and exit. */
+  if(! config_read_file(&(libconfig_privdata.cfg), libconfig_privdata.configfile)) {
+    fprintf(stderr,"[LIBCONFIG] %s %d file %s - %d - %s\n",__FILE__, __LINE__,
+                   libconfig_privdata.configfile, config_error_line(&(libconfig_privdata.cfg)),
+                   config_error_text(&(libconfig_privdata.cfg)));
+    config_destroy(&(libconfig_privdata.cfg));
+    printf( "\n");
+    return -1;
+  }
+  
+
+  return 0;
+}
+
+
+void config_libconfig_end(void )
+{
+  config_destroy(&(libconfig_privdata.cfg));
+  if ( libconfig_privdata.configfile != NULL ) {
+     free(libconfig_privdata.configfile);
+  } 
+  
+}

common/config/libconfig/config_libconfig.h

@@ -0,0 +1,54 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file common/config/libconfig/config_libconfig.c
+ * \brief configuration module, include file for libconfig implementation 
+ * \author Francois TABURET
+ * \date 2017
+ * \version 0.1
+ * \company NOKIA BellLabs France
+ * \email: francois.taburet@nokia-bell-labs.com
+ * \note
+ * \warning
+ */
+#ifndef INCLUDE_CONFIG_LIBCONFIG_H
+#define INCLUDE_CONFIG_LIBCONFIG_H
+
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include "common/config/config_paramdesc.h"
+
+
+
+ 
+typedef struct libconfig_privatedata {
+      char *configfile;
+      config_t cfg;
+} libconfig_privatedata_t;
+ 
+#ifdef __cplusplus
+}
+#endif
+#endif  /* INCLUDE_CONFIG_LIBCONFIG_H */

common/config/libconfig/config_libconfig_private.h

@@ -0,0 +1,39 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file common/config/libconfig/config_libconfig_private.h
+ * \brief configuration module, include file for libconfig implementation 
+ * \author Francois TABURET
+ * \date 2017
+ * \version 0.1
+ * \company NOKIA BellLabs France
+ * \email: francois.taburet@nokia-bell-labs.com
+ * \note
+ * \warning
+ */
+
+
+static libconfig_privatedata_t libconfig_privdata;
+
+
+
+      
+

common/ran_context.h

@@ -0,0 +1,86 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file PHY/impl_defs_lte.h
+* \brief LTE Physical channel configuration and variable structure definitions
+* \author R. Knopp, F. Kaltenberger
+* \date 2011
+* \version 0.1
+* \company Eurecom
+* \email: knopp@eurecom.fr,florian.kaltenberger@eurecom.fr
+* \note
+* \warning
+*/
+
+#ifndef __RAN_CONTEXT_H__
+#define __RAN_CONTEXT_H__
+
+#include <pthread.h>
+#include "COMMON/platform_constants.h"
+#include "PHY/defs.h"
+#include "PHY/types.h"
+#include "PHY/impl_defs_top.h"
+#include "PHY/impl_defs_lte.h"
+#include "RRC/LITE/defs.h"
+
+#include "gtpv1u.h"
+#include "NwGtpv1u.h"
+#include "NwGtpv1uMsg.h"
+#include "NwGtpv1uPrivate.h"
+#include "gtpv1u_eNB_defs.h"
+
+typedef struct {
+  /// RAN context config file name
+  char *config_file_name;
+  /// Number of RRC instances in this node
+  int nb_inst;
+  /// Number of Component Carriers per instance in this node
+  int *nb_CC;
+  /// Number of MACRLC instances in this node
+  int nb_macrlc_inst;
+  /// Number of component carriers per instance in this node
+  int *nb_mac_CC;
+  /// Number of L1 instances in this node
+  int nb_L1_inst;
+  /// Number of Component Carriers per instance in this node
+  int *nb_L1_CC;
+  /// Number of RU instances in this node
+  int nb_RU;
+  /// eNB context variables
+  struct PHY_VARS_eNB_s ***eNB;
+  /// RRC context variables
+  struct eNB_RRC_INST_s **rrc;
+  /// RRC context variables
+  struct eNB_MAC_INST_s **mac;
+  /// GTPu descriptor 
+  gtpv1u_data_t *gtpv1u_data_g;
+  /// RU descriptors. These describe what each radio unit is supposed to do and contain the necessary functions for fronthaul interfaces
+  struct RU_t_s **ru;
+  /// Mask to indicate fronthaul setup status of RU (hard-limit to 64 RUs)
+  uint64_t ru_mask;
+  /// Mutex for protecting ru_mask
+  pthread_mutex_t ru_mutex;
+  /// condition variable for signaling setup completion of an RU
+  pthread_cond_t ru_cond;
+} RAN_CONTEXT_t;
+
+
+#endif

common/utils/T/.gitignore

@@ -10,4 +10,9 @@ tracer/replay
 tracer/textlog
 tracer/vcd
 tracer/macpdu2wireshark
+tracer/ue
+tracer/to_vcd
+tracer/extract_input_subframe
+tracer/extract_output_subframe
+tracer/extract
 tracee/tracee

common/utils/T/T.c

@@ -36,7 +36,7 @@ static void get_message(int s)
   int is_on;
 
   if (read(s, &t, 1) != 1) QUIT("get_message fails");
-printf("got mess %d\n", t);
+printf("T tracer: got mess %d\n", t);
   switch (t) {
   case 0:
     /* toggle all those IDs */

common/utils/T/T_defs.h

@@ -29,10 +29,10 @@ typedef struct {
 #define T_SHM_FILENAME "/T_shm_segment"
 
 /* number of VCD functions (to be kept up to date! see in T_messages.txt) */
-#define VCD_NUM_FUNCTIONS 172
+#define VCD_NUM_FUNCTIONS 178
 
 /* number of VCD variables (to be kept up to date! see in T_messages.txt) */
-#define VCD_NUM_VARIABLES 118
+#define VCD_NUM_VARIABLES 128
 
 /* first VCD function (to be kept up to date! see in T_messages.txt) */
 #define VCD_FIRST_FUNCTION    ((uintptr_t)T_VCD_FUNCTION_RT_SLEEP)

common/utils/T/T_messages.txt

@@ -16,31 +16,31 @@ ID = ENB_PHY_DL_TICK
 ID = ENB_PHY_DLSCH_UE_DCI
     DESC = eNodeB downlink UE specific DCI as sent by the PHY layer
     GROUP = ALL:PHY:GRAPHIC:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,dci_format : int,harq_pid : int,mcs : int,TBS
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,dci_format : int,harq_pid : int,mcs : int,TBS
 ID = ENB_PHY_DLSCH_UE_ACK
     DESC = eNodeB downlink UE ACK as seen by the PHY layer in process_HARQ_feedback
     GROUP = ALL:PHY:GRAPHIC:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid
 ID = ENB_PHY_DLSCH_UE_NACK
     DESC = eNodeB downlink UE NACK as seen by the PHY layer in process_HARQ_feedback
     GROUP = ALL:PHY:GRAPHIC:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid
 ID = ENB_PHY_ULSCH_UE_DCI
     DESC = eNodeB uplink UE specific DCI as sent by the PHY layer
     GROUP = ALL:PHY:GRAPHIC:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid : int,mcs : int,round : int,first_rb : int,nb_rb : int,TBS : int,L : int,firstCCE
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid : int,mcs : int,round : int,first_rb : int,nb_rb : int,TBS : int,L : int,firstCCE
 ID = ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION
     DESC = eNodeB uplink UE retransmission due to PHICH NACK (see generate_phich_top)
     GROUP = ALL:PHY:GRAPHIC:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid
 ID = ENB_PHY_ULSCH_UE_ACK
     DESC = eNodeB uplink UE ACK as seen by the PHY layer
     GROUP = ALL:PHY:GRAPHIC:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid
 ID = ENB_PHY_ULSCH_UE_NACK
     DESC = eNodeB uplink UE NACK as seen by the PHY layer
     GROUP = ALL:PHY:GRAPHIC:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid
 ID = ENB_PHY_INPUT_SIGNAL
     DESC = eNodeB received signal in the time domain for a duration of 1ms
     GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
@@ -52,31 +52,31 @@ ID = ENB_PHY_OUTPUT_SIGNAL
 ID = ENB_PHY_UL_CHANNEL_ESTIMATE
     DESC = eNodeB channel estimation in the time domain
     GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
-    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,antenna : buffer,chest_t
+    FORMAT = int,eNB_ID : int,rnti : int,frame : int,subframe : int,antenna : buffer,chest_t
 ID = ENB_PHY_PUSCH_IQ
     DESC = eNodeB PUSCH received IQ data
     GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
-    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,nb_rb : int,N_RB_UL : int,symbols_per_tti : buffer,pusch_comp
+    FORMAT = int,eNB_ID : int,rnti : int,frame : int,subframe : int,nb_rb : int,N_RB_UL : int,symbols_per_tti : buffer,pusch_comp
 ID = ENB_PHY_PUCCH_1AB_IQ
     DESC = eNodeB PUCCH received IQ data
     GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
-    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,I : int,Q
+    FORMAT = int,eNB_ID : int,rnti : int,frame : int,subframe : int,I : int,Q
 ID = ENB_PHY_PUCCH_1_ENERGY
     DESC = eNodeB PUCCH 1 energy and threshold
     GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
-    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,energy : int,threshold
+    FORMAT = int,eNB_ID : int,rnti : int,frame : int,subframe : int,energy : int,threshold
 ID = ENB_PHY_PHICH
     DESC = eNodeB PHICH
     GROUP = ALL:PHY:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid : int,NGROUP : int,NSF : int,ngroup : int,nseq : int,ACK : int,first_rb : int,n_DMRS
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid : int,NGROUP : int,NSF : int,ngroup : int,nseq : int,ACK : int,first_rb : int,n_DMRS
 ID = ENB_PHY_MSG3_ALLOCATION
     DESC = eNodeB Msg3 allocation/reallocation
     GROUP = ALL:PHY:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,first_transmission : int,Msg3_frame : int,Msg3_subframe
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,first_transmission : int,Msg3_frame : int,Msg3_subframe
 ID = ENB_PHY_INITIATE_RA_PROCEDURE
     DESC = eNodeB initiates a random access procedure after detecting enough energy for one of the preambles
     GROUP = ALL:PHY:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,preamble : int,energy : int,delay
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,preamble : int,energy : int,delay
 
 #MAC logs
 ID = ENB_MAC_UE_DL_SDU
@@ -834,27 +834,27 @@ ID = UE_PHY_DL_TICK
 ID = UE_PHY_DLSCH_UE_DCI
     DESC = UE downlink UE specific DCI as sent by the PHY layer
     GROUP = ALL:PHY:GRAPHIC:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,dci_format : int,harq_pid : int,mcs : int,TBS
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,dci_format : int,harq_pid : int,mcs : int,TBS
 ID = UE_PHY_DLSCH_UE_ACK
     DESC = UE downlink UE ACK as seen by the PHY layer in process_HARQ_feedback
     GROUP = ALL:PHY:GRAPHIC:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid
 ID = UE_PHY_DLSCH_UE_NACK
     DESC = UE downlink UE NACK as seen by the PHY layer in process_HARQ_feedback
     GROUP = ALL:PHY:GRAPHIC:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid
 ID = UE_PHY_ULSCH_UE_DCI
     DESC = UE uplink UE specific DCI as sent by the PHY layer
     GROUP = ALL:PHY:GRAPHIC:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid : int,mcs : int,round : int,first_rb : int,nb_rb : int,TBS
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid : int,mcs : int,round : int,first_rb : int,nb_rb : int,TBS
 ID = UE_PHY_ULSCH_UE_ACK
     DESC = UE uplink UE ACK as seen by the PHY layer
     GROUP = ALL:PHY:GRAPHIC:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid
 ID = UE_PHY_ULSCH_UE_NACK
     DESC = UE uplink UE NACK as seen by the PHY layer
     GROUP = ALL:PHY:GRAPHIC:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid
 ID = UE_PHY_INPUT_SIGNAL
     DESC = UE received signal in the time domain for a duration of 1ms
     GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
@@ -862,7 +862,7 @@ ID = UE_PHY_INPUT_SIGNAL
 ID = UE_PHY_DL_CHANNEL_ESTIMATE
     DESC = UE channel estimation in the time domain
     GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,antenna : buffer,chest_t
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,antenna : buffer,chest_t
 ID = UE_PHY_PDCCH_IQ
     DESC = UE PDCCH received IQ data
     GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
@@ -870,27 +870,27 @@ ID = UE_PHY_PDCCH_IQ
 ID = UE_PHY_PDCCH_ENERGY
     DESC = UE PDSCH 1 energy and threshold
     GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,pdcch_ch_level00 : int,pdcch_ch_level01 : int,pdcch_ch_level10: int,pdcch_ch_level11
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,pdcch_ch_level00 : int,pdcch_ch_level01 : int,pdcch_ch_level10: int,pdcch_ch_level11
 ID = UE_PHY_PDSCH_IQ
     DESC = UE PDSCH received IQ data
     GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,nb_rb : int,N_RB_UL : int,symbols_per_tti : buffer,pusch_comp
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,nb_rb : int,N_RB_UL : int,symbols_per_tti : buffer,pusch_comp
 ID = UE_PHY_PDSCH_ENERGY
     DESC = UE PDSCH 1 energy and threshold
     GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,pdsch_ch_level00 : int,pdsch_ch_level01 : int,pdsch_ch_level10: int,pdsch_ch_level11
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,pdsch_ch_level00 : int,pdsch_ch_level01 : int,pdsch_ch_level10: int,pdsch_ch_level11
 ID = UE_PHY_PUSCH_TX_POWER
     DESC = UE PUSCH  tx power
     GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,eNB_ID : int,UE_id : int,frame : int,subframe : int,p0_pusch : int,ampl: int,g_pusch: int,pl: int,nb_rb
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,p0_pusch : int,ampl: int,g_pusch: int,pl: int,nb_rb
 ID = UE_PHY_PUCCH_TX_POWER
     DESC = UE PDSCH 1 energy and threshold
     GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,eNB_ID : int,UE_id : int,frame : int,subframe : int,p0_pucch : int,ampl: int,g_pucch: int,pl
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,p0_pucch : int,ampl: int,g_pucch: int,pl
 ID = UE_PHY_MEAS
     DESC = UE PHY measurements
     GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,rsrp : int,rssi : int,snr: int,rx_power: int,noise_power: int,w_cqi: int,freq_offset
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rsrp : int,rssi : int,snr: int,rx_power: int,noise_power: int,w_cqi: int,freq_offset
 
 #for debug/test - not used
 ID = first
@@ -958,6 +958,38 @@ ID = VCD_VARIABLE_SUBFRAME_NUMBER_RX1_ENB
     DESC = VCD variable SUBFRAME_NUMBER_RX1_ENB
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
+ID = VCD_VARIABLE_FRAME_NUMBER_TX0_RU
+    DESC = VCD variable FRAME_NUMBER_TX0_RU
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_FRAME_NUMBER_TX1_RU
+    DESC = VCD variable FRAME_NUMBER_TX1_RU
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_FRAME_NUMBER_RX0_RU
+    DESC = VCD variable FRAME_NUMBER_RX0_RU
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_FRAME_NUMBER_RX1_RU
+    DESC = VCD variable FRAME_NUMBER_RX1_RU
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_TX0_RU
+    DESC = VCD variable SUBFRAME_NUMBER_TX0_RU
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_TX1_RU
+    DESC = VCD variable SUBFRAME_NUMBER_TX1_RU
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_RX0_RU
+    DESC = VCD variable SUBFRAME_NUMBER_RX0_RU
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_RX1_RU
+    DESC = VCD variable SUBFRAME_NUMBER_RX1_RU
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
 ID = VCD_VARIABLE_RUNTIME_TX_ENB
     DESC = VCD variable RUNTIME_TX_ENB
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
@@ -1050,6 +1082,14 @@ ID = VCD_VARIABLE_TRX_TST
     DESC = VCD variable TRX_TST
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
+ID = VCD_VARIABLE_TRX_TS_UE
+    DESC = VCD variable TRX_TS_UE
+    GROUP = ALL:VCD:UE:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_TRX_TST_UE
+    DESC = VCD variable TRX_TST_UE
+    GROUP = ALL:VCD:UE:VCD_VARIABLE
+    FORMAT = ulong,value
 ID = VCD_VARIABLE_TRX_WRITE_FLAGS
     DESC = VCD variable TRX_WRITE_FLAGS
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
@@ -1413,6 +1453,14 @@ ID = VCD_FUNCTION_TRX_WRITE
     DESC = VCD function TRX_WRITE
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
+ID = VCD_FUNCTION_TRX_READ_UE
+    DESC = VCD function TRX_READ_UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_TRX_WRITE_UE
+    DESC = VCD function TRX_WRITE_UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
 ID = VCD_FUNCTION_TRX_READ_IF
     DESC = VCD function TRX_READ_IF
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
@@ -1565,12 +1613,28 @@ ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_TX1
     DESC = VCD function PHY_PROCEDURES_ENB_TX1
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
-ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX_COMMON
-    DESC = VCD function PHY_PROCEDURES_ENB_RX_COMMON
+ID = VCD_FUNCTION_PHY_PROCEDURES_RU_FEPRX
+    DESC = VCD function PHY_PROCEDURES_RU_FEPRX
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
-ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX_COMMON1
-    DESC = VCD function PHY_PROCEDURES_ENB_RX_COMMON1
+ID = VCD_FUNCTION_PHY_PROCEDURES_RU_FEPRX1
+    DESC = VCD function PHY_PROCEDURES_RU_FEPRX1
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PHY_PROCEDURES_RU_FEPTX_OFDM
+    DESC = VCD function PHY_PROCEDURES_RU_FEPTX_OFDM
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PHY_PROCEDURES_RU_FEPTX_OFDM1
+    DESC = VCD function PHY_PROCEDURES_RU_FEPTX_OFDM1
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PHY_PROCEDURES_RU_FEPTX_PREC
+    DESC = VCD function PHY_PROCEDURES_RU_FEPTX_PREC
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PHY_PROCEDURES_RU_FEPTX_PREC1
+    DESC = VCD function PHY_PROCEDURES_RU_FEPTX_PREC1
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX_UESPEC
@@ -1581,10 +1645,6 @@ ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX_UESPEC1
     DESC = VCD function PHY_PROCEDURES_ENB_RX_UESPEC1
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
-ID = VCD_FUNCTION_ENB_SLOT_FEP
-    DESC = VCD function ENB_SLOT_FEP
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
 ID = VCD_FUNCTION_PHY_PROCEDURES_UE_TX
     DESC = VCD function PHY_PROCEDURES_UE_TX
     GROUP = ALL:VCD:UE:VCD_FUNCTION
@@ -1781,6 +1841,10 @@ ID = VCD_FUNCTION_PHY_ENB_PRACH_RX
     DESC = VCD function PHY_ENB_PRACH_RX
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
+ID = VCD_FUNCTION_PHY_RU_PRACH_RX
+    DESC = VCD function PHY_RU_PRACH_RX
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
 ID = VCD_FUNCTION_PHY_ENB_PDCCH_TX
     DESC = VCD function PHY_ENB_PDCCH_TX
     GROUP = ALL:VCD:ENB:VCD_FUNCTION

common/utils/T/local_tracer.c

@@ -63,7 +63,7 @@ static int get_connection(char *addr, int port)
   socklen_t alen;
   int s, t;
 
-  printf("waiting for connection on %s:%d\n", addr, port);
+  printf("T tracer: waiting for connection on %s:%d\n", addr, port);
 
   s = socket(AF_INET, SOCK_STREAM, 0);
   if (s == -1) { perror("socket"); exit(1); }
@@ -82,7 +82,7 @@ static int get_connection(char *addr, int port)
   if (t == -1) { perror("accept"); exit(1); }
   close(s);
 
-  printf("connected\n");
+  printf("T tracer: connected\n");
 
   return t;
 }
@@ -150,7 +150,7 @@ process:
   while (size) {
     int l = write(f->socket_remote, b, size);
     if (l <= 0) {
-      printf("forward error\n");
+      printf("T tracer: forward error\n");
       close(f->socket_remote);
       f->socket_remote = -1;
       break;
@@ -268,7 +268,7 @@ static void *forwarder(int port, int s)
   f->memusage = 0;
   f->last_warning_memusage = 0;
 
-  printf("waiting for remote tracer on port %d\n", port);
+  printf("T tracer: waiting for remote tracer on port %d\n", port);
 
   f->remote_port = port;
   f->socket_remote = get_connection("0.0.0.0", port);
@@ -305,7 +305,7 @@ static void forward(void *_forwarder, char *buf, int size)
   if (f->memusage > f->last_warning_memusage &&
       f->memusage - f->last_warning_memusage > 100000000) {
     f->last_warning_memusage += 100000000;
-    printf("WARNING: memory usage is over %"PRIu64"MB\n",
+    printf("T tracer: WARNING: memory usage is over %"PRIu64"MB\n",
            f->last_warning_memusage / 1000000);
   } else
   if (f->memusage < f->last_warning_memusage &&

common/utils/T/tracer/Makefile

@@ -3,10 +3,11 @@ CFLAGS=-Wall -g -pthread -DT_TRACER -I.
 
 #CFLAGS += -O3 -ffast-math -fomit-frame-pointer
 
-LIBS=-lX11 -lm -lpng -lXft
+LIBS=-lm
+XLIBS=-lX11 -lpng -lXft
 
 all: record replay extract_config textlog enb ue vcd macpdu2wireshark \
-     extract_input_subframe
+     extract_input_subframe extract_output_subframe to_vcd extract
 
 record: utils.o record.o database.o config.o
 	$(CC) $(CFLAGS) -o record $^ $(LIBS)
@@ -21,25 +22,36 @@ extract_input_subframe: extract_input_subframe.o database.o event.o utils.o \
     config.o
 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
 
+extract_output_subframe: extract_output_subframe.o database.o event.o utils.o \
+    config.o
+	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
+
+extract: extract.o database.o event.o utils.o config.o
+	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
+
 textlog: utils.o textlog.o database.o event.o handler.o config.o \
          event_selector.o view/view.a gui/gui.a logger/logger.a \
          filter/filter.a
-	$(CC) $(CFLAGS) -o textlog $^ $(LIBS)
+	$(CC) $(CFLAGS) -o textlog $^ $(LIBS) $(XLIBS)
 
 enb: utils.o enb.o database.o event.o handler.o config.o \
          event_selector.o view/view.a gui/gui.a logger/logger.a \
          filter/filter.a
-	$(CC) $(CFLAGS) -o enb $^ $(LIBS)
+	$(CC) $(CFLAGS) -o enb $^ $(LIBS) $(XLIBS)
 
 ue: utils.o ue.o database.o event.o handler.o config.o \
          event_selector.o view/view.a gui/gui.a logger/logger.a \
          filter/filter.a
-	$(CC) $(CFLAGS) -o ue $^ $(LIBS)
+	$(CC) $(CFLAGS) -o ue $^ $(LIBS) $(XLIBS)
 
 vcd: utils.o vcd.o database.o event.o handler.o config.o \
          event_selector.o view/view.a gui/gui.a logger/logger.a \
          filter/filter.a
-	$(CC) $(CFLAGS) -o vcd $^ $(LIBS)
+	$(CC) $(CFLAGS) -o vcd $^ $(LIBS) $(XLIBS)
+
+to_vcd: to_vcd.o database.o event.o handler.o utils.o config.o \
+         logger/logger.a filter/filter.a
+	$(CC) $(CFLAGS) -o to_vcd $^ $(LIBS)
 
 macpdu2wireshark: macpdu2wireshark.o database.o utils.o handler.o event.o \
                   config.o
@@ -65,6 +77,7 @@ filter/filter.a:
 clean:
 	rm -f *.o core tracer_remote textlog enb ue vcd record replay
 	rm -f extract_config macpdu2wireshark extract_input_subframe
+	rm -f extract_output_subframe to_vcd extract
 	cd gui && make clean
 	cd view && make clean
 	cd logger && make clean

common/utils/T/tracer/enb.c

@@ -17,6 +17,44 @@
 #include "openair_logo.h"
 #include "config.h"
 
+/****************************************************************************/
+/* conversion from rnti to "ue_id" (which does not really exists)           */
+/* the idea is to assign an ue_id to an rnti as soon as we get an event     */
+/* for the rnti                                                             */
+/****************************************************************************/
+
+int ue_id[65536];
+int next_ue_id;
+
+void reset_ue_ids(void)
+{
+  int i;
+  printf("resetting known UEs\n");
+  for (i = 0; i < 65536; i++) ue_id[i] = -1;
+  ue_id[65535] = 0;
+  ue_id[65534] = 1;     /* HACK: to be removed */
+  ue_id[2]     = 2;     /* this supposes RA RNTI = 2, very openair specific */
+  next_ue_id = 3;
+}
+
+int ue_id_from_rnti(void *_priv, int rnti)
+{
+  if (rnti < 0) rnti = 65534; /* HACK, to be removed */
+
+  if (rnti < 0 || rnti > 65535) { printf("bad rnti %d\n", rnti); exit(1); }
+  /* rnti not seen yet? give it a new ue_id */
+  if (ue_id[rnti] == -1) {
+    ue_id[rnti] = next_ue_id;
+    next_ue_id++;
+  }
+  return ue_id[rnti];
+}
+
+/****************************************************************************/
+/* end of rnti->ue_id conversion                                            */
+/****************************************************************************/
+
+
 typedef struct {
   view *phyview;
   view *macview;
@@ -25,6 +63,7 @@ typedef struct {
   view *rrcview;
   view *legacy;
   widget *current_ue_label;
+  widget *current_ue_button;
   widget *prev_ue_button;
   widget *next_ue_button;
   widget *pusch_iq_ue_xy_plot;
@@ -58,6 +97,7 @@ typedef struct {
   enb_gui *e;
   int ue;                /* what UE is displayed in the UE specific views */
   void *database;
+  int nb_rb;
 } enb_data;
 
 void is_on_changed(void *_d)
@@ -85,27 +125,6 @@ connection_dies:
   if (pthread_mutex_unlock(&d->lock)) abort();
 }
 
-void usage(void)
-{
-  printf(
-"options:\n"
-"    -d <database file>        this option is mandatory\n"
-"    -on <GROUP or ID>         turn log ON for given GROUP or ID\n"
-"    -off <GROUP or ID>        turn log OFF for given GROUP or ID\n"
-"    -ON                       turn all logs ON\n"
-"    -OFF                      turn all logs OFF\n"
-"                              note: you may pass several -on/-off/-ON/-OFF,\n"
-"                                    they will be processed in order\n"
-"                                    by default, all is off\n"
-"    -ip <host>                connect to given IP address (default %s)\n"
-"    -p <port>                 connect to given port (default %d)\n"
-"    -debug-gui                activate GUI debug logs\n",
-  DEFAULT_REMOTE_IP,
-  DEFAULT_REMOTE_PORT
-  );
-  exit(1);
-}
-
 static void *gui_thread(void *_g)
 {
   gui *g = _g;
@@ -116,11 +135,15 @@ static void *gui_thread(void *_g)
 static filter *ticktime_filter(void *database, char *event, int i, int ue)
 {
   /* filter is "harq_pid == i && UE_id == 0 && eNB_id == 0" */
+  /* we get the UE_id from the rnti */
   return
     filter_and(
       filter_eq(filter_evarg(database, event, "harq_pid"), filter_int(i)),
       filter_and(
-        filter_eq(filter_evarg(database, event, "UE_id"), filter_int(ue)),
+        filter_eq(
+          filter_evfun(database, ue_id_from_rnti, NULL,
+            filter_evarg(database, event, "rnti")),
+          filter_int(ue)),
         filter_eq(filter_evarg(database, event, "eNB_ID"), filter_int(0))));
 }
 
@@ -148,23 +171,28 @@ static void set_current_ue(gui *g, enb_data *e, int ue)
 
   logger_set_filter(e->e->pusch_iq_ue_logger,
       filter_eq(
-        filter_evarg(e->database, "ENB_PHY_PUSCH_IQ", "UE_ID"),
+        filter_evfun(e->database, ue_id_from_rnti, NULL,
+          filter_evarg(e->database, "ENB_PHY_PUSCH_IQ", "rnti")),
         filter_int(ue)));
   logger_set_filter(e->e->ul_estimate_ue_logger,
       filter_eq(
-        filter_evarg(e->database, "ENB_PHY_UL_CHANNEL_ESTIMATE", "UE_ID"),
+        filter_evfun(e->database, ue_id_from_rnti, NULL,
+          filter_evarg(e->database, "ENB_PHY_UL_CHANNEL_ESTIMATE", "rnti")),
         filter_int(ue)));
   logger_set_filter(e->e->pucch1_energy_ue_threshold_logger,
       filter_eq(
-        filter_evarg(e->database, "ENB_PHY_PUCCH_1_ENERGY", "UE_ID"),
+        filter_evfun(e->database, ue_id_from_rnti, NULL,
+          filter_evarg(e->database, "ENB_PHY_PUCCH_1_ENERGY", "rnti")),
         filter_int(ue)));
   logger_set_filter(e->e->pucch1_energy_ue_energy_logger,
       filter_eq(
-        filter_evarg(e->database, "ENB_PHY_PUCCH_1_ENERGY", "UE_ID"),
+        filter_evfun(e->database, ue_id_from_rnti, NULL,
+          filter_evarg(e->database, "ENB_PHY_PUCCH_1_ENERGY", "rnti")),
         filter_int(ue)));
   logger_set_filter(e->e->pucch_iq_ue_logger,
       filter_eq(
-        filter_evarg(e->database, "ENB_PHY_PUCCH_1AB_IQ", "UE_ID"),
+        filter_evfun(e->database, ue_id_from_rnti, NULL,
+          filter_evarg(e->database, "ENB_PHY_PUCCH_1AB_IQ", "rnti")),
         filter_int(ue)));
   for (i = 0; i < 8; i++) {
     logger_set_filter(e->e->dl_dci_logger[i],
@@ -185,11 +213,13 @@ static void set_current_ue(gui *g, enb_data *e, int ue)
   }
   logger_set_filter(e->e->dl_mcs_logger,
       filter_eq(
-        filter_evarg(e->database, "ENB_PHY_DLSCH_UE_DCI", "UE_id"),
+        filter_evfun(e->database, ue_id_from_rnti, NULL,
+          filter_evarg(e->database, "ENB_PHY_DLSCH_UE_DCI", "rnti")),
         filter_int(ue)));
   logger_set_filter(e->e->ul_mcs_logger,
       filter_eq(
-        filter_evarg(e->database, "ENB_PHY_ULSCH_UE_DCI", "UE_id"),
+        filter_evfun(e->database, ue_id_from_rnti, NULL,
+          filter_evarg(e->database, "ENB_PHY_ULSCH_UE_DCI", "rnti")),
         filter_int(ue)));
 }
 
@@ -201,12 +231,15 @@ static void click(void *private, gui *g,
   enb_data *ed = private;
   enb_gui *e = ed->e;
   int ue = ed->ue;
+  int do_reset = 0;
 
   if (button != 1) return;
   if (w == e->prev_ue_button) { ue--; if (ue < 0) ue = 0; }
   if (w == e->next_ue_button) ue++;
+  if (w == e->current_ue_button) do_reset = 1;
 
   if (pthread_mutex_lock(&ed->lock)) abort();
+  if (do_reset) reset_ue_ids();
   if (ue != ed->ue) {
     set_current_ue(g, ed, ue);
     ed->ue = ue;
@@ -248,10 +281,12 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database,
   widget_add_child(g, col, logo, -1);
   w = new_container(g, HORIZONTAL);
   widget_add_child(g, col, w, -1);
+  /* TODO: use button widget, not label widget */
   w2 = new_label(g, "");
   widget_add_child(g, w, w2, -1);
+  label_set_clickable(g, w2, 1);
+  e->current_ue_button = w2;
   e->current_ue_label = w2;
-  /* TODO: use button widget, not label widget */
   w2 = new_label(g, "  [prev UE]  ");
   widget_add_child(g, w, w2, -1);
   label_set_clickable(g, w2, 1);
@@ -264,14 +299,14 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database,
 
   input_signal_plot = new_xy_plot(g, 256, 55, "input signal", 20);
   widget_add_child(g, line, input_signal_plot, -1);
-  xy_plot_set_range(g, input_signal_plot, 0, 7680*10, 20, 70);
+  xy_plot_set_range(g, input_signal_plot, 0, 7680*10 * ed->nb_rb/25, 20, 70);
   input_signal_log = new_framelog(h, database,
       "ENB_PHY_INPUT_SIGNAL", "subframe", "rxdata");
   /* a skip value of 10 means to process 1 frame over 10, that is
    * more or less 10 frames per second
    */
   framelog_set_skip(input_signal_log, 10);
-  input_signal_view = new_view_xy(7680*10, 10,
+  input_signal_view = new_view_xy(7680*10 * ed->nb_rb/25, 10,
       g, input_signal_plot, new_color(g, "#0c0c72"), XY_LOOP_MODE);
   logger_add_view(input_signal_log, input_signal_view);
 
@@ -589,7 +624,8 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database,
   container_set_child_growable(g, top_container, text, 1);
   e->legacy = new_view_textlist(10000, 10, g, text);
 
-  set_current_ue(g, ed, 0);
+  set_current_ue(g, ed, ed->ue);
+  register_notifier(g, "click", e->current_ue_button, click, ed);
   register_notifier(g, "click", e->prev_ue_button, click, ed);
   register_notifier(g, "click", e->next_ue_button, click, ed);
 }
@@ -610,6 +646,28 @@ void view_add_log(view *v, char *log, event_handler *h, void *database,
   on_off(database, log, is_on, 1);
 }
 
+void usage(void)
+{
+  printf(
+"options:\n"
+"    -d   <database file>      this option is mandatory\n"
+"    -rb  <RBs>                setup for this number of RBs (default 25)\n"
+"    -on  <GROUP or ID>        turn log ON for given GROUP or ID\n"
+"    -off <GROUP or ID>        turn log OFF for given GROUP or ID\n"
+"    -ON                       turn all logs ON\n"
+"    -OFF                      turn all logs OFF\n"
+"                              note: you may pass several -on/-off/-ON/-OFF,\n"
+"                                    they will be processed in order\n"
+"                                    by default, all is off\n"
+"    -ip <host>                connect to given IP address (default %s)\n"
+"    -p  <port>                connect to given port (default %d)\n"
+"    -debug-gui                activate GUI debug logs\n",
+  DEFAULT_REMOTE_IP,
+  DEFAULT_REMOTE_PORT
+  );
+  exit(1);
+}
+
 int main(int n, char **v)
 {
   extern int volatile gui_logd;
@@ -628,6 +686,10 @@ int main(int n, char **v)
   enb_gui eg;
   enb_data enb_data;
 
+  reset_ue_ids();
+
+  enb_data.nb_rb = 25;
+
   /* write on a socket fails if the other end is closed and we get SIGPIPE */
   if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) abort();
 
@@ -638,6 +700,8 @@ int main(int n, char **v)
     if (!strcmp(v[i], "-h") || !strcmp(v[i], "--help")) usage();
     if (!strcmp(v[i], "-d"))
       { if (i > n-2) usage(); database_filename = v[++i]; continue; }
+    if (!strcmp(v[i], "-rb"))
+      { if (i > n-2) usage(); enb_data.nb_rb = atoi(v[++i]); continue; }
     if (!strcmp(v[i], "-ip")) { if (i > n-2) usage(); ip = v[++i]; continue; }
     if (!strcmp(v[i], "-p"))
       { if (i > n-2) usage(); port = atoi(v[++i]); continue; }
@@ -653,6 +717,11 @@ int main(int n, char **v)
     usage();
   }
 
+  switch (enb_data.nb_rb) {
+  case 25: case 50: case 100: break;
+  default: printf("ERROR, bad value for -rb (%d)\n", enb_data.nb_rb); exit(1);
+  }
+
   if (database_filename == NULL) {
     printf("ERROR: provide a database file (-d)\n");
     exit(1);
@@ -671,7 +740,7 @@ int main(int n, char **v)
   g = gui_init();
   new_thread(gui_thread, g);
 
-  enb_data.ue = 0;
+  enb_data.ue = 3;
   enb_data.e = &eg;
   enb_data.database = database;
 

common/utils/T/tracer/extract.c

@@ -0,0 +1,124 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include "database.h"
+#include "event.h"
+#include "config.h"
+
+void usage(void)
+{
+  printf(
+"usage: [options] <file> <event> <buffer name>\n"
+"options:\n"
+"    -d <database file>        this option is mandatory\n"
+"    -o <output file>          this option is mandatory\n"
+"    -f <name> <value>         field 'name' of 'event' has to match 'value'\n"
+"                              type of 'name' must be int\n"
+"                              (you can use several -f options)\n"
+  );
+  exit(1);
+}
+
+int get_filter_arg(database_event_format *f, char *field, char *type)
+{
+  int i;
+  for (i = 0; i < f->count; i++)
+    if (!strcmp(f->name[i], field)) {
+      if (strcmp(f->type[i], type)) break;
+      return i;
+    }
+  printf("bad field %s, check that it exists and has type '%s'\n",field,type);
+  exit(1);
+}
+
+int main(int n, char **v)
+{
+  char *database_filename = NULL;
+  void *database;
+  int i;
+  int input_event_id;
+  database_event_format f;
+  char *file = NULL;
+  char *output_file = NULL;
+  FILE *out;
+  int fd;
+  char *event_name = NULL;
+  char *buffer_name = NULL;
+  char *filter[n];
+  int filter_arg[n];
+  int filter_value[n];
+  int filter_count = 0;
+  int buffer_arg;
+  int found;
+
+  for (i = 1; i < n; i++) {
+    if (!strcmp(v[i], "-h") || !strcmp(v[i], "--help")) usage();
+    if (!strcmp(v[i], "-d"))
+      { if (i > n-2) usage(); database_filename = v[++i]; continue; }
+    if (!strcmp(v[i], "-o"))
+      { if (i > n-2) usage(); output_file = v[++i]; continue; }
+    if (!strcmp(v[i], "-f")) { if (i>n-3) usage();
+      filter[filter_count]         = v[++i];
+      filter_value[filter_count++] = atoi(v[++i]);
+      continue;
+    }
+    if (file == NULL) { file = v[i]; continue; }
+    if (event_name == NULL) { event_name = v[i]; continue; }
+    if (buffer_name == NULL) { buffer_name = v[i]; continue; }
+    usage();
+  }
+  if (file == NULL || event_name == NULL || buffer_name == NULL) usage();
+
+  if (database_filename == NULL) {
+    printf("ERROR: provide a database file (-d)\n");
+    exit(1);
+  }
+
+  if (output_file == NULL) {
+    printf("gimme -o <output file>, thanks\n");
+    exit(1);
+  }
+
+  out = fopen(output_file, "w"); if(out==NULL){perror(output_file);exit(1);}
+
+  database = parse_database(database_filename);
+
+  load_config_file(database_filename);
+
+  input_event_id = event_id_from_name(database, event_name);
+  f = get_format(database, input_event_id);
+
+  buffer_arg = get_filter_arg(&f, buffer_name, "buffer");
+
+  for (i = 0; i < filter_count; i++)
+    filter_arg[i] = get_filter_arg(&f, filter[i], "int");
+
+  fd = open(file, O_RDONLY);
+  if (fd == -1) { perror(file); exit(1); }
+
+  found = 0;
+
+  while (1) {
+    char v[T_BUFFER_MAX];
+    event e;
+    e = get_event(fd, v, database);
+    if (e.type == -1) break;
+    if (e.type != input_event_id) continue;
+    for (i = 0; i < filter_count; i++)
+      if (filter_value[i] != e.e[filter_arg[i]].i)
+        break;
+    if (i != filter_count)
+      continue;
+    if (fwrite(e.e[buffer_arg].b, e.e[buffer_arg].bsize, 1, out) != 1)
+      { perror(output_file); exit(1); }
+    found = 1;
+    break;
+  }
+
+  if (found == 0) printf("ERROR: event not found\n");
+
+  fclose(out);
+
+  return 0;
+}

common/utils/T/tracer/extract_input_subframe.c

@@ -12,7 +12,9 @@ void usage(void)
 "usage: [options] <file> <frame> <subframe>\n"
 "options:\n"
 "    -d <database file>        this option is mandatory\n"
+"    -o <output file>          this option is mandatory\n"
 "    -v                        verbose\n"
+"    -c <number of subframes>  default to 1\n"
   );
   exit(1);
 }
@@ -25,15 +27,23 @@ int main(int n, char **v)
   int input_event_id;
   database_event_format f;
   char *file = NULL;
+  char *output_file = NULL;
+  FILE *out;
   int fd;
   int frame = -1, subframe = -1;
   int frame_arg, subframe_arg, buffer_arg;
   int verbose = 0;
+  int number_of_subframes = 1;
+  int processed_subframes = 0;
 
   for (i = 1; i < n; i++) {
     if (!strcmp(v[i], "-h") || !strcmp(v[i], "--help")) usage();
     if (!strcmp(v[i], "-d"))
       { if (i > n-2) usage(); database_filename = v[++i]; continue; }
+    if (!strcmp(v[i], "-o"))
+      { if (i > n-2) usage(); output_file = v[++i]; continue; }
+    if (!strcmp(v[i], "-c"))
+      { if (i > n-2) usage(); number_of_subframes = atoi(v[++i]); continue; }
     if (!strcmp(v[i], "-v")) { verbose = 1; continue; }
     if (file == NULL) { file = v[i]; continue; }
     if (frame == -1) { frame = atoi(v[i]); continue; }
@@ -47,6 +57,19 @@ int main(int n, char **v)
     exit(1);
   }
 
+  if (number_of_subframes < 1) {
+    printf("bad value for option -c, must be at least 1 and is %d\n",
+           number_of_subframes);
+    exit(1);
+  }
+
+  if (output_file == NULL) {
+    printf("gimme -o <output file>, thanks\n");
+    exit(1);
+  }
+
+  out = fopen(output_file, "w"); if(out==NULL){perror(output_file);exit(1);}
+
   database = parse_database(database_filename);
 
   load_config_file(database_filename);
@@ -99,11 +122,22 @@ short *x = e.e[buffer_arg].b;
 x[i] *= 14;
 }
 #endif
-    fwrite(e.e[buffer_arg].b, e.e[buffer_arg].bsize, 1, stdout);
-    fflush(stdout);
-    return 0;
+    if (fwrite(e.e[buffer_arg].b, e.e[buffer_arg].bsize, 1, out) != 1)
+      { perror(output_file); exit(1); }
+    processed_subframes++;
+    number_of_subframes--;
+    if (!number_of_subframes) {
+      if (fclose(out)) perror(output_file);
+      printf("%d subframes dumped\n", processed_subframes);
+      return 0;
+    }
+    subframe++;
+    if (subframe == 10) { subframe = 0; frame=(frame+1)%1024; }
   }
 
   printf("frame %d subframe %d not found\n", frame, subframe);
+  printf("%d subframes dumped\n", processed_subframes);
+  fclose(out);
+
   return 0;
 }

common/utils/T/tracer/extract_output_subframe.c

@@ -0,0 +1,158 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include "database.h"
+#include "event.h"
+#include "config.h"
+
+void usage(void)
+{
+  printf(
+"usage: [options] <file> <frame> <subframe> <number of subframes>\n"
+"    the program dumps 'number of subframes' subframes starting\n"
+"    at 'frame:suubframe'\n"
+"options:\n"
+"    -d <database file>        this option is mandatory\n"
+"    -o <output file>          output to file (default: stdout)\n"
+"    -v                        verbose\n"
+  );
+  exit(1);
+}
+
+int main(int n, char **v)
+{
+  char *database_filename = NULL;
+  void *database;
+  int i;
+  int output_event_id;
+  database_event_format f;
+  char *file = NULL;
+  int fd;
+  int frame = -1, subframe = -1;
+  int number_of_subframes = -1;
+  int frame_arg, subframe_arg, buffer_arg;
+  int verbose = 0;
+  char *out_filename = NULL;
+  FILE *out;
+
+  for (i = 1; i < n; i++) {
+    if (!strcmp(v[i], "-h") || !strcmp(v[i], "--help")) usage();
+    if (!strcmp(v[i], "-d"))
+      { if (i > n-2) usage(); database_filename = v[++i]; continue; }
+    if (!strcmp(v[i], "-o"))
+      { if (i > n-2) usage(); out_filename = v[++i]; continue; }
+    if (!strcmp(v[i], "-v")) { verbose = 1; continue; }
+    if (file == NULL)              { file = v[i]; continue; }
+    if (frame == -1)               { frame = atoi(v[i]); continue; }
+    if (subframe == -1)            { subframe = atoi(v[i]); continue; }
+    if (number_of_subframes == -1) {number_of_subframes=atoi(v[i]);continue;}
+    usage();
+  }
+  if (file == NULL || frame == -1 || subframe == -1 ||
+      number_of_subframes == -1) usage();
+
+  if (database_filename == NULL) {
+    printf("ERROR: provide a database file (-d)\n");
+    exit(1);
+  }
+
+  if (out_filename == NULL) out = stdout;
+  else {
+    out = fopen(out_filename, "w");
+    if (out == NULL) { perror(out_filename); exit(1); }
+  }
+
+  database = parse_database(database_filename);
+
+  load_config_file(database_filename);
+
+  output_event_id = event_id_from_name(database, "ENB_PHY_OUTPUT_SIGNAL");
+  f = get_format(database, output_event_id);
+
+  frame_arg = subframe_arg = buffer_arg = -1;
+  for (i = 0; i < f.count; i++) {
+    if (!strcmp(f.name[i], "frame")) {
+      if (frame_arg != -1) goto err;
+      if (strcmp(f.type[i], "int")) goto err;
+      frame_arg = i;
+    }
+    if (!strcmp(f.name[i], "subframe")) {
+      if (subframe_arg != -1) goto err;
+      if (strcmp(f.type[i], "int")) goto err;
+      subframe_arg = i;
+    }
+    if (!strcmp(f.name[i], "txdata")) {
+      if (buffer_arg != -1) goto err;
+      if (strcmp(f.type[i], "buffer")) goto err;
+      buffer_arg = i;
+    }
+    continue;
+err:
+    printf("cannot deal with ENB_PHY_OUTPUT_SIGNAL from database file\n");
+    exit(1);
+  }
+  if (frame_arg == -1 || subframe_arg == -1 || buffer_arg == -1) goto err;
+
+  fd = open(file, O_RDONLY);
+  if (fd == -1) { perror(file); exit(1); }
+
+  int last_frame = -1;
+  int last_subframe = -1;
+  int subframe_written = 0;
+  while (1) {
+    char v[T_BUFFER_MAX];
+    event e;
+    e = get_event(fd, v, database);
+    if (e.type == -1) break;
+    if (e.type != output_event_id) continue;
+    if (verbose)
+      printf("found output frame %d subframe %d size %d\n",
+             e.e[frame_arg].i, e.e[subframe_arg].i, e.e[buffer_arg].bsize);
+    if (!(last_frame != -1 ||
+          (frame == e.e[frame_arg].i && subframe == e.e[subframe_arg].i)))
+      continue;
+    frame = e.e[frame_arg].i;
+    subframe = e.e[subframe_arg].i;
+    if (last_frame != -1) {
+      if (frame*10+subframe != (last_frame*10+last_subframe + 1) % 10240) {
+        printf("error: discontinuity, not what you want...\n");
+        exit(1);
+      }
+    }
+    last_frame = frame;
+    last_subframe = subframe;
+#if 0
+for (i = 0; i < e.e[buffer_arg].bsize/2; i++) {
+short *x = e.e[buffer_arg].b;
+x[i] *= 14;
+}
+#endif
+    if (verbose)
+      printf("save output frame %d subframe %d size %d\n",
+             e.e[frame_arg].i, e.e[subframe_arg].i, e.e[buffer_arg].bsize);
+    if (fwrite(e.e[buffer_arg].b, e.e[buffer_arg].bsize, 1, out) != 1) {
+      perror(out_filename);
+      exit(1);
+    }
+    subframe_written++;
+    if (subframe_written != number_of_subframes)
+      continue;
+
+    /* done */
+    fflush(out);
+    if (out_filename != NULL) {
+      if (fclose(out)) perror(out_filename);
+    }
+    if (verbose)
+      printf("%d subframes written\n", subframe_written);
+    return 0;
+  }
+
+  printf("error with input file, %d subframe written\n", subframe_written);
+  fflush(out);
+  if (out_filename != NULL) {
+    if (fclose(out)) perror(out_filename);
+  }
+  return 1;
+}

common/utils/T/tracer/filter/filter.c

@@ -10,6 +10,8 @@ struct filter {
     struct { struct filter *a, *b; } op2;
     int v;
     struct { int event_type; int arg_index; } evarg;
+    struct { int (*fun)(void *priv, int v); void *priv;
+             struct filter *x; } evfun;
   } v;
 
   int (*eval)(struct filter *this, event e);
@@ -52,6 +54,11 @@ int eval_evarg(struct filter *f, event e)
   return e.e[f->v.evarg.arg_index].i;
 }
 
+int eval_evfun(struct filter *f, event e)
+{
+  return f->v.evfun.fun(f->v.evfun.priv, f->v.evfun.x->eval(f->v.evfun.x, e));
+}
+
 /****************************************************************************/
 /*                     free memory functions                                */
 /****************************************************************************/
@@ -63,6 +70,12 @@ void free_op2(struct filter *f)
   free(f);
 }
 
+void free_evfun(struct filter *f)
+{
+  free_filter(f->v.evfun.x);
+  free(f);
+}
+
 void free_noop(struct filter *f)
 {
   free(f);
@@ -135,6 +148,19 @@ filter *filter_evarg(void *database, char *event_name, char *varname)
   return ret;
 }
 
+filter *filter_evfun(void *database, int (*fun)(void *priv, int v),
+    void *priv, filter *x)
+{
+  struct filter *ret = calloc(1, sizeof(struct filter));
+  if (ret == NULL) abort();
+  ret->eval = eval_evfun;
+  ret->free = free_evfun;
+  ret->v.evfun.fun  = fun;
+  ret->v.evfun.priv = priv;
+  ret->v.evfun.x    = x;
+  return ret;
+}
+
 void free_filter(filter *_f)
 {
   struct filter *f;

common/utils/T/tracer/filter/filter.h

@@ -9,6 +9,8 @@ filter *filter_and(filter *a, filter *b);
 filter *filter_eq(filter *a, filter *b);
 filter *filter_int(int v);
 filter *filter_evarg(void *database, char *event_name, char *varname);
+filter *filter_evfun(void *database, int (*fun)(void *priv, int v),
+    void *priv, filter *x);
 
 int filter_eval(filter *f, event e);
 

common/utils/T/tracer/to_vcd.c

@@ -0,0 +1,302 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <signal.h>
+#include <unistd.h>
+#include "database.h"
+#include "utils.h"
+#include "handler.h"
+#include "config.h"
+#include "logger/logger.h"
+#include "view/view.h"
+
+typedef struct {
+  char *event;
+  char *arg;
+  char *vcd_name;
+  int boolean;
+} vcd_vars;
+
+/****************************************************************************/
+/* VCD file handling begin                                                  */
+/****************************************************************************/
+
+FILE *out;
+
+uint64_t start_time;
+int start_time_inited;
+
+void vcd_init(char *file)
+{
+  out = fopen(file, "w"); if (out == NULL) { perror(file); exit(1); }
+}
+
+void vcd_write_header(vcd_vars *v, int n)
+{
+  int i;
+
+  if (fprintf(out,
+"$date\n"
+"  January, 1, 1970.\n"
+"$end\n"
+"$version\n"
+"  to_vcd\n"
+"$end\n"
+"$timescale 1ns $end\n"
+"$scope module logic $end\n") <= 0) abort();
+
+  for (i = 0; i < n; i++)
+    if (fprintf(out, "$var wire %d %s %s $end\n",
+           v[i].boolean ? 1 : 64,
+           v[i].vcd_name, v[i].vcd_name) <= 0) abort();
+
+  if (fprintf(out,
+"$upscope $end\n"
+"$enddefinitions $end\n"
+"$dumpvars\n") <= 0) abort();
+
+  for (i = 0; i < n; i++)
+    if (v[i].boolean) {
+      if (fprintf(out, "0%s\n", v[i].vcd_name) <= 0) abort();
+    } else {
+      if (fprintf(out, "b0 %s\n", v[i].vcd_name) <= 0) abort();
+    }
+
+  if (fprintf(out,
+"$end\n") <= 0) abort();
+
+}
+
+void vcd_end(void)
+{
+  if (fclose(out)) { perror("error closing VCD file"); exit(1); }
+}
+
+char *b64(uint64_t val)
+{
+  static char v[65];
+  char *s = &v[64];
+  *s = 0;
+  if (val == 0) { s--; *s = '0'; return s; }
+  while (val) {
+    s--;
+    *s = val&1 ? '1' : '0';
+    val >>= 1;
+  }
+  return s;
+}
+
+void vcd_dump(char *v)
+{
+  uint64_t h, m, s, ns;
+  char t;
+  uint64_t val;
+  uint64_t time;
+  char var[256];
+  if (sscanf(v, "%"SCNu64":%"SCNu64":%"SCNu64".%"SCNu64": %c %"SCNu64" %s",
+      &h, &m, &s, &ns, &t, &val, var) != 7)
+    goto err;
+  time = h*60*60*1000000000 +
+            m*60*1000000000 +
+               s*1000000000 +
+                         ns;
+  if (!start_time_inited) {
+    start_time = time;
+    start_time_inited = 1;
+  }
+  if (fprintf(out, "#%"PRIu64"\n", time - start_time) <= 0) abort();
+  switch (t) {
+  case 'b': if (fprintf(out, "%d%s\n", val!=0, var) <= 0) abort(); break;
+  case 'l': if (fprintf(out, "b%s %s\n", b64(val), var) <= 0) abort(); break;
+  default: goto err;
+  }
+
+  return;
+
+err:
+  printf("bad vcd_dump line '%s'\n", v);
+  exit(1);
+}
+
+/****************************************************************************/
+/* VCD file handling end                                                    */
+/****************************************************************************/
+
+
+/****************************************************************************/
+/* vcd view start                                                           */
+/****************************************************************************/
+
+struct vcd_view {
+  view common;
+};
+
+static void vcd_view_clear(view *this)
+{
+  /* nothing */
+}
+
+static void vcd_view_append(view *_this, char *s)
+{
+  vcd_dump(s);
+}
+
+static view *new_view_vcd(void)
+{
+  struct vcd_view *ret = calloc(1, sizeof(struct vcd_view));
+  if (ret == NULL) abort();
+  ret->common.clear = vcd_view_clear;
+  ret->common.append = (void (*)(view *, ...))vcd_view_append;
+  return (view *)ret;
+}
+
+/****************************************************************************/
+/* vcd view end                                                             */
+/****************************************************************************/
+
+void activate_traces(int socket, int number_of_events, int *is_on)
+{
+  char t = 1;
+  if (socket_send(socket, &t, 1) == -1 ||
+      socket_send(socket, &number_of_events, sizeof(int)) == -1 ||
+      socket_send(socket, is_on, number_of_events * sizeof(int)) == -1)
+    abort();
+}
+
+void usage(void)
+{
+  printf(
+"options:\n"
+"    -d <database file>           this option is mandatory\n"
+"    -o <output file>             this option is mandatory\n"
+"    -ip <host>                   connect to given IP address (default %s)\n"
+"    -p <port>                    connect to given port (default %d)\n"
+"    -b <event> <arg> <vcd name>  trace as binary (0 off, anything else on)\n"
+"    -l <event> <arg> <vcd name>  trace as uint64_t\n",
+  DEFAULT_REMOTE_IP,
+  DEFAULT_REMOTE_PORT
+  );
+  exit(1);
+}
+
+int run = 1;
+static int socket = -1;
+
+void force_stop(int x)
+{
+  printf("\ngently quit...\n");
+  close(socket);
+  socket = -1;
+  run = 0;
+}
+
+int main(int n, char **v)
+{
+  char *output_filename = NULL;
+  char *database_filename = NULL;
+  void *database;
+  char *ip = DEFAULT_REMOTE_IP;
+  int port = DEFAULT_REMOTE_PORT;
+  int *is_on;
+  int number_of_events;
+  int i;
+  vcd_vars vars[n];
+  int nvars = 0;
+  view *vcd_view;
+  event_handler *h;
+  logger *textlog;
+
+  /* write on a socket fails if the other end is closed and we get SIGPIPE */
+  if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) abort();
+
+  for (i = 1; i < n; i++) {
+    if (!strcmp(v[i], "-h") || !strcmp(v[i], "--help")) usage();
+    if (!strcmp(v[i], "-d"))
+      { if (i > n-2) usage(); database_filename = v[++i]; continue; }
+    if (!strcmp(v[i], "-o"))
+      { if (i > n-2) usage(); output_filename = v[++i]; continue; }
+    if (!strcmp(v[i], "-ip")) { if (i > n-2) usage(); ip = v[++i]; continue; }
+    if (!strcmp(v[i], "-p"))
+      { if (i > n-2) usage(); port = atoi(v[++i]); continue; }
+    if (!strcmp(v[i], "-b")) { if(i>n-4)usage();
+      vars[nvars].event     = v[++i];
+      vars[nvars].arg       = v[++i];
+      vars[nvars].vcd_name  = v[++i];
+      vars[nvars++].boolean = 1;
+      continue;
+    }
+    if (!strcmp(v[i], "-l")) { if(i>n-4)usage();
+      vars[nvars].event     = v[++i];
+      vars[nvars].arg       = v[++i];
+      vars[nvars].vcd_name  = v[++i];
+      vars[nvars++].boolean = 0;
+      continue;
+    }
+    usage();
+  }
+
+  if (output_filename == NULL) {
+    printf("ERROR; provide an output file (-o)\n");
+    exit(1);
+  }
+
+  if (database_filename == NULL) {
+    printf("ERROR: provide a database file (-d)\n");
+    exit(1);
+  }
+
+  database = parse_database(database_filename);
+
+  load_config_file(database_filename);
+
+  number_of_events = number_of_ids(database);
+  is_on = calloc(number_of_events, sizeof(int));
+  if (is_on == NULL) abort();
+
+  h = new_handler(database);
+
+  /* create the view */
+  vcd_view = new_view_vcd();
+
+  /* setup traces */
+  for (i = 0; i < nvars; i++) {
+    char format[256];
+    if (strlen(vars[i].arg) > 256-3) abort();
+    if (strlen(vars[i].vcd_name) > 256-1) abort();
+    sprintf(format, "%c [%s] %s",
+        vars[i].boolean ? 'b' : 'l',
+        vars[i].arg,
+        vars[i].vcd_name);
+    textlog = new_textlog(h, database, vars[i].event, format);
+    logger_add_view(textlog, vcd_view);
+    on_off(database, vars[i].event, is_on, 1);
+  }
+
+  socket = connect_to(ip, port);
+
+  /* activate selected traces */
+  activate_traces(socket, number_of_events, is_on);
+
+  vcd_init(output_filename);
+  vcd_write_header(vars, nvars);
+
+  /* exit on ctrl+c and ctrl+z */
+  if (signal(SIGQUIT, force_stop) == SIG_ERR) abort();
+  if (signal(SIGINT, force_stop) == SIG_ERR) abort();
+  if (signal(SIGTSTP, force_stop) == SIG_ERR) abort();
+
+  /* read messages */
+  while (run) {
+    char v[T_BUFFER_MAX];
+    event e;
+    e = get_event(socket, v, database);
+    if (e.type == -1) { printf("disconnected? let's quit gently\n"); break; }
+    handle_event(h, e);
+  }
+
+  vcd_end();
+
+  return 0;
+}

common/utils/asn1_conversions.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/assertions.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/hashtable/hashtable.c

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under 
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.  
  * You may obtain a copy of the License at
  *

common/utils/hashtable/hashtable.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under 
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.  
  * You may obtain a copy of the License at
  *

common/utils/hashtable/obj_hashtable.c

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under 
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.  
  * You may obtain a copy of the License at
  *

common/utils/hashtable/obj_hashtable.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under 
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.  
  * You may obtain a copy of the License at
  *

common/utils/itti/assertions.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti/backtrace.c

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti/backtrace.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti/intertask_interface.c

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -206,6 +206,7 @@ void *itti_malloc(task_id_t origin_task_id, task_id_t destination_task_id, ssize
 
 #else
   ptr = malloc (size);
+  if (ptr) memset(ptr,0,size);
 #endif
 
   AssertFatal (ptr != NULL, "Memory allocation of %d bytes failed (%d -> %d)!\n", (int) size, origin_task_id, destination_task_id);
@@ -622,7 +623,6 @@ static inline void itti_receive_msg_internal_event_fd(task_id_t task_id, uint8_t
       read_ret = read (itti_desc.threads[thread_id].task_event_fd, &sem_counter, sizeof(sem_counter));
       AssertFatal (read_ret == sizeof(sem_counter), "Read from task message FD (%d) failed (%d/%d)!\n", thread_id, (int) read_ret, (int) sizeof(sem_counter));
 
-
       if (lfds611_queue_dequeue (itti_desc.tasks[task_id].message_queue, (void **) &message) == 0) {
         /* No element in list -> this should not happen */
         AssertFatal (0, "No message in queue for task %d while there are %d events and some for the messages queue!\n", task_id, epoll_ret);
@@ -630,9 +630,12 @@ static inline void itti_receive_msg_internal_event_fd(task_id_t task_id, uint8_t
 
       AssertFatal(message != NULL, "Message from message queue is NULL!\n");
       *received_msg = message->msg;
+
+
       result = itti_free (ITTI_MSG_ORIGIN_ID(*received_msg), message);
       AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
 
+
       /* Mark that the event has been processed */
       itti_desc.threads[thread_id].events[i].events &= ~EPOLLIN;
       return;

common/utils/itti/intertask_interface.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti/intertask_interface_dump.c

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -481,6 +481,35 @@ static void *itti_dump_socket(void *arg_p)
 #ifdef RTAI
   struct timeval  timeout;
 #endif
+  char temp[1024];
+  char cpu_affinity[1024];
+  cpu_set_t cpuset;
+  int s;
+
+  CPU_ZERO(&cpuset);
+
+  CPU_SET(10, &cpuset);
+  s = pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
+  if (s != 0)
+  {
+    perror( "rrc pthread_setaffinity_np");
+    exit_fun("rrc Error setting processor affinity");
+  }
+
+  /* Check the actual affinity mask assigned to the thread */
+  s = pthread_getaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
+  if (s != 0)
+  {
+    perror( "rrc pthread_getaffinity_np");
+    exit_fun("rrc Error getting processor affinity ");
+  }
+  memset(cpu_affinity,0,sizeof(cpu_affinity));
+  if (CPU_ISSET(10, &cpuset))
+  {
+    sprintf (temp, " CPU_10");
+    strcat(cpu_affinity, temp);
+  }
+  printf("Setting the affinity of itti_dump_socket to CPU %s!\n", cpu_affinity);
 
   ITTI_DUMP_DEBUG(0x2, " Creating TCP dump socket on port %u\n", ITTI_PORT);
 

common/utils/itti/intertask_interface_dump.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti/intertask_interface_init.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti/intertask_interface_types.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti/intertask_messages_def.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti/intertask_messages_types.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti/itti_types.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti/memory_pools.c

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti/memory_pools.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti/messages_def.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti/messages_types.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti/signals.c

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti/signals.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti/tasks_def.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti/timer.c

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti/timer.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti/timer_messages_def.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti/timer_messages_types.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti_analyzer/common/itti_types.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti_analyzer/common/logs.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti_analyzer/common/rc.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti_analyzer/itti_analyzer.c

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/itti_analyzer/libbuffers/buffers.c

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *