Merge branch 'x2-ho' of https://gitlab.eurecom.fr/oai/openairinterface5g into x2-ho

Update the itti x2 ho req message

.gitlab-ci.yml

@@ -2,6 +2,8 @@ job1:
   script:
     - date
     - pwd
+    - echo $OAI_USER
+    - echo $OAI_PASS
     - echo $OAI_TEST_CASE_GROUP
     - echo $MACHINELIST
     - echo $MACHINELISTGENERIC

LICENSE

@@ -1,200 +1,94 @@
-				The OpenAirInterface Software Alliance (OSA)
-					OAI Public License (Version 1.1)
+                      OAI PUBLIC LICENSE V1.0
 
-LICENSE TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION OF OPENAIR 5G SOFTWARE.
+ 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.
 
-1.	Definitions.
-
-“License” shall mean the terms and conditions for use, reproduction, and distribution set forth 
-in this document.
+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
+“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.
 
-“Contributor License Agreement” shall mean the agreement signed by any Contributor setting 
-forth the terms and conditions applicable to its Contribution. 
+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” 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. Grant of Patent License.
 
-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
+3.1 Grant of Patent License for non-commercial purposes:
 
-3. 	Grant of Patent 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 (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.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”).
+3.2 Grant of Patent License for commercial purposes:
 
-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.
+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.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.
 
-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.
+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.
 
-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:  
+4. Redistibution
 
-1. You must give any other recipients of the Work or Derivative Works a copy of this 
-License; and
+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:
 
-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.
 
-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.
+1. You must give any other recipients of the Work or Derivative Works a copy of this License; 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.
+2. You must cause any modified files by You to carry prominent notices stating that You changed the files; 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.
+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
 
-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.
+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.
 
-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.
 
-11. Applicable law. 
-The present license shall be governed by the laws of France.
+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.
 
 END OF TERMS AND CONDITIONS
 
-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.
+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”);
 
-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
 
-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,
+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.
+See the License for the specific language governing permissions and
 
+limitations under the License.

README.txt

@@ -43,4 +43,3 @@ 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.1  (the "License"); you may not use this file
+# * 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
 # *
@@ -27,8 +27,6 @@ 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)
@@ -238,10 +236,6 @@ add_boolean_option(XFORMS              False "This adds the possibility to see t
 add_boolean_option(PRINT_STATS         False "This adds the possibility to see the status")
 add_boolean_option(T_TRACER            False "Activate the T tracer, a debugging/monitoring framework" )
 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(DEBUG_CONSOLE False "makes debugging easier, disables stdout/stderr buffering")
 
@@ -292,7 +286,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-e30.asn)
+  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1c/ASN1_files/RRC-e10.asn)
 endif  (${RRC_ASN1_VERSION} STREQUAL "Rel8")
 
 set (RRC_FULL_DIR ${asn1_generated_dir}/${RRC_ASN1_VERSION})
@@ -313,11 +307,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}
-    ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1_msg.c)
+add_library(RRC_LIB ${rrc_h} ${rrc_source})
 include_directories ("${RRC_FULL_DIR}")
 
 # add the command to generate the source code
@@ -418,7 +412,15 @@ add_library(S1AP_ENB
 #X2AP
 # Same limitation as described in RRC/S1AP: unknown generated file list
 # so we generate it at cmake time
-##############
+########################################
+# X2AP LAYER OPTIONS
+##########################
+add_boolean_option(ENABLE_USE_X2                True "Enable X2 interface for X2 handover")
+
+if (${ENABLE_USE_X2})
+
+#message("-- X2AP = ${ENABLE_USE_X2}")
+
 add_list1_option(X2AP_VERSION R11 "X2AP Asn.1 grammar version" R10 R11)
 set(X2AP_DIR ${OPENAIR2_DIR}/X2AP)
 if (${X2AP_VERSION} STREQUAL "R11")
@@ -472,15 +474,30 @@ add_custom_command (
   DEPENDS ${X2AP_ASN_FILES}
   )
 
-add_library(X2AP_LIB
+add_library(X2AP_MSG_LIB
   ${X2AP_OAI_generated}
   ${X2AP_source}
   ${X2AP_DIR}/x2ap_common.c
   )
+set(X2AP_LIB X2AP_MSG_LIB)
 
 include_directories ("${X2AP_C_DIR}")
 include_directories ("${X2AP_DIR}")
 
+add_library(X2AP_ENB_LIB
+  ${X2AP_C_DIR}/x2ap_ies_defs.h
+  ${X2AP_DIR}/x2ap_eNB.c
+  ${X2AP_DIR}/x2ap_eNB_decoder.c
+  ${X2AP_DIR}/x2ap_eNB_encoder.c
+  ${X2AP_DIR}/x2ap_eNB_handler.c
+  ${X2AP_DIR}/x2ap_eNB_itti_messaging.c
+  ${X2AP_DIR}/x2ap_eNB_management_procedures.c
+  ${X2AP_DIR}/x2ap_eNB_generate_messages.c
+  )
+set(X2AP_ENB X2AP_ENB_LIB)
+
+endif()
+
 # Hardware dependant options
 ###################################
 add_list1_option(NB_ANTENNAS_RX "2" "Number of antennas in reception" "1" "2" "4")
@@ -490,24 +507,8 @@ 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" "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
 ######################################################################
 
@@ -551,28 +552,6 @@ set(TPLIB_ETHERNET_SOURCE
   )
 add_library(oai_eth_transpro MODULE ${TPLIB_ETHERNET_SOURCE} )
 
-include_directories("${OPENAIR_TARGETS}/ARCH/mobipass/")
-set(TPLIB_MOBIPASS_SOURCE
-  ${OPENAIR_TARGETS}/ARCH/mobipass/interface.c
-  ${OPENAIR_TARGETS}/ARCH/mobipass/mobipass.c
-  ${OPENAIR_TARGETS}/ARCH/mobipass/queues.c
-  )
-add_library(oai_mobipass MODULE ${TPLIB_MOBIPASS_SOURCE} )
-
-# Hide all functions/variables in the mobipass library.
-# Use __attribute__((__visibility__("default")))
-# in the source code to unhide a function/variable.
-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")
 
 ##########################################################
 
@@ -606,7 +585,6 @@ add_boolean_option(MESSAGE_CHART_GENERATOR_RLC_MAC False "trace RLC-MAC exchange
 add_boolean_option(MESSAGE_CHART_GENERATOR_PHY     False "trace some PHY exchanges in sequence diagrams")
 
 add_boolean_option(FLEXRAN_AGENT_SB_IF             False         "enable FlexRAN agent to inteface with a SDN controller")
-add_boolean_option(UE_EXPANSION             False         "enable UE_EXPANSION with max 256 UE")
 
 ########################
 # Include order
@@ -728,6 +706,7 @@ add_boolean_option(RRC_DEFAULT_RAB_IS_AM       False  "Otherwise it is UM, confi
 ##########################
 # none
 
+
 ##########################
 # PROJECTS (IST, FRENCH COLL., etc)
 # SPECIFIC OPTIONS
@@ -770,7 +749,6 @@ 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}")
@@ -1000,12 +978,10 @@ 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/ru_procedures.c
-#  ${OPENAIR1_DIR}/SCHED/phy_mac_stub.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
@@ -1034,7 +1010,6 @@ 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
@@ -1087,6 +1062,7 @@ 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
@@ -1118,7 +1094,6 @@ 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)
@@ -1169,7 +1144,7 @@ set(L2_SRC
   ${RRC_DIR}/L2_interface.c
   )
 set (MAC_SRC
-  ${PHY_INTERFACE_DIR}/IF_Module.c
+  ${MAC_DIR}/lte_transport_init.c
   ${MAC_DIR}/main.c
   ${MAC_DIR}/ue_procedures.c
   ${MAC_DIR}/ra_procedures.c
@@ -1604,7 +1579,6 @@ ${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
@@ -1612,7 +1586,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
 )
 
@@ -1683,25 +1657,9 @@ else()
 endif()
 
 # Atlas is required by some packages, but not found in pkg-config
-# So, here are some hacks here. Hope this gets fixed in future!
-if(EXISTS "/usr/include/atlas/cblas.h" OR EXISTS "/usr/include/cblas.h")
+if(EXISTS "/usr/include/atlas/cblas.h")
   include_directories("/usr/include/atlas")
-  LINK_DIRECTORIES("/usr/lib64")
-  LINK_DIRECTORIES("/usr/lib64/atlas") #Added because atlas libraries in CentOS 7 are here!
-  
-  if(EXISTS "/usr/lib64/libblas.so" OR EXISTS "/usr/lib/libblas.so") #Case for CentOS7
-     list(APPEND ATLAS_LIBRARIES blas)
-  else() # Case for Ubuntu
-     list(APPEND ATLAS_LIBRARIES cblas)
-  endif()
-
-  if(EXISTS "/usr/lib/atlas/libtatlas.so" OR EXISTS "/usr/lib64/atlas/libtatlas.so") #Case for CentOS7
-     list(APPEND ATLAS_LIBRARIES tatlas)
-  else()
-     list(APPEND ATLAS_LIBRARIES atlas) #Case for Ubuntu
-  endif()
-
-  list(APPEND ATLAS_LIBRARIES lapack)
+  list(APPEND ATLAS_LIBRARIES cblas atlas lapack)
 else()
   message("No Blas/Atlas libs found, some targets will fail")
 endif()
@@ -1763,11 +1721,11 @@ add_definitions(-DASN1_MINIMUM_VERSION=924)
 add_executable(lte-softmodem
   ${rrc_h}
   ${s1ap_h}
+  ${x2ap_h}
   ${OPENAIR_BIN_DIR}/messages_xml.h
   ${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
@@ -1782,13 +1740,11 @@ 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 ${X2AP_LIB} ${X2AP_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
   -Wl,--end-group )
 
 target_link_libraries (lte-softmodem ${LIBXML2_LIBRARIES})
@@ -1801,11 +1757,11 @@ target_link_libraries (lte-softmodem ${T_LIB})
 add_executable(lte-softmodem-nos1
   ${rrc_h}
   ${s1ap_h}
+  ${x2ap_h}
   ${OPENAIR_BIN_DIR}/messages_xml.h
   ${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
@@ -1819,12 +1775,10 @@ 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 ${X2AP_LIB} ${X2AP_ENB} 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
   -Wl,--end-group )
 
 target_link_libraries (lte-softmodem-nos1 ${LIBXML2_LIBRARIES})
@@ -1888,7 +1842,7 @@ add_executable(oaisim
   ${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
   ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
@@ -1908,15 +1862,13 @@ 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 SECU_OSA ${ITTI_LIB}  ${MIH_LIB}
+  RRC_LIB S1AP_LIB S1AP_ENB ${X2AP_LIB} ${X2AP_ENB} 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} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB}
   -Wl,--end-group )
 
 target_link_libraries (oaisim ${LIBXML2_LIBRARIES} ${LAPACK_LIBRARIES})
@@ -1936,7 +1888,6 @@ 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
@@ -1954,13 +1905,11 @@ 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 SECU_OSA ${ITTI_LIB}  ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
+  RRC_LIB ${X2AP_LIB} ${X2AP_ENB} 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 SCTP_CLIENT UDP
   -Wl,--end-group )
 
 target_link_libraries (oaisim_nos1 ${LIBXML2_LIBRARIES} ${LAPACK_LIBRARIES})
@@ -2015,7 +1964,7 @@ add_executable(test_epc_generate_scenario
   ${OPENAIR_BIN_DIR}/messages_xml.h
   )
 target_link_libraries (test_epc_generate_scenario
-  -Wl,--start-group RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB GTPV1U LIB_NAS_UE SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${ITTI_LIB} ${MSC_LIB} L2 -Wl,--end-group pthread m rt crypt sctp ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} ${CONFIG_LIBRARIES}
+  -Wl,--start-group RRC_LIB S1AP_LIB S1AP_ENB ${X2AP_LIB} ${X2AP_ENB} GTPV1U LIB_NAS_UE SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${ITTI_LIB} ${MSC_LIB} L2 -Wl,--end-group pthread m rt crypt sctp ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} ${CONFIG_LIBRARIES}
   )
 
 add_executable(test_epc_play_scenario
@@ -2036,7 +1985,7 @@ add_executable(test_epc_play_scenario
   )
 target_include_directories(test_epc_play_scenario PUBLIC /usr/local/share/asn1c)
 target_link_libraries (test_epc_play_scenario
-  -Wl,--start-group RRC_LIB S1AP_LIB X2AP_LIB GTPV1U LIB_NAS_UE SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${ITTI_LIB} ${MSC_LIB} -Wl,--end-group pthread m rt crypt sctp ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} ${CONFIG_LIBRARIES}
+  -Wl,--start-group RRC_LIB S1AP_LIB ${X2AP_LIB} ${X2AP_ENB} GTPV1U LIB_NAS_UE SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${ITTI_LIB} ${MSC_LIB} -Wl,--end-group pthread m rt crypt sctp ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} ${CONFIG_LIBRARIES}
   )
 
 
@@ -2077,7 +2026,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 OPENAIR0_LIB)
+        GTPV1U SCTP_CLIENT UDP LIB_NAS_UE LFDS LFDS7 SIMU SIMU_ETH OPENAIR0_LIB)
     if (TARGET ${i})
       add_dependencies(${i} generate_T)
     endif()

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

cmake_targets/autotests/test_case_list.xml

@@ -941,14 +941,9 @@
       (Test 7b, 5 MHz, R3-1.FDD (MCS 15), ETU70, 1.4 dB (30%)),
       (Test 10, 5 MHz, R6.FDD (MCS 25), EVA5, 17.4 dB (70%)),
       (Test 10b, 5 MHz, R6-1.FDD (MCS 24,18 PRB), EVA5, 17.5dB (70%)),
-      (Test 11, 10 MHz, R7.FDD (MCS 25), EVA5, 17.7dB (70%)),
-      (Test 11b, 10 MHz, R7-1.FDD (MCS 25), EVA5, 16.7dB (70%)),
-      (Test 15, 20 MHz, R.9 FDD	(MCS 26), EVA5, 17.6dB (70%)),
-      (Test 15b, 20 MHz, R.9-2 FDD (MCS 26, 17PRB), EVA5, 17.3dB (70%)),
-      (Test 15c, 20 MHz, R.9-1 FDD (MCS 26, 83 PRB), EVA5, 16.6dB (70%)),
-
+      (Test 11, 10 MHz, R7.FDD (MCS 25), EVA5, 17.7dB (70%))
       (TM2 Test 1 10 MHz, R.11 FDD (MCS 14), EVA5, 6.8 dB (70%)),
-      (TM2 Test 1b 5 MHz, R.11-2 FDD (MCS 13), EVA5, 5.9 dB (70%)),
+      (TM2 Test 1b 20 MHz, R.11-2 FDD (MCS 13), EVA5, 5.9 dB (70%)),
        </desc>
       <pre_compile_prog></pre_compile_prog>
       <compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
@@ -965,9 +960,6 @@
                        -m25 -gF -s17.4 -w1.0 -f.2 -n500 -B25 -c3 -z2 -O70
                        -m25 -gF -s17.5 -w1.0 -f.2 -n500 -B25 -c3 -z2 -r1022 -O70
                        -m26 -gF -s17.7 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O70
-                       -m26 -gF -s17.6 -w1.0 -f.2 -n500 -B100 -c2 -z2 -O70
-                       -m26 -gF -s17.3 -w1.0 -f.2 -n500 -B100 -c2 -z2 -r1600 -O70
-                       -m26 -gF -s16.6 -w1.0 -f.2 -n500 -B100 -c2 -z2 -r1899 -O70
 		       -m14 -gF -s6.8  -w1.0 -f.2 -n500 -B50 -c2 -x2 -y2 -z2 -O70
                        -m13 -gF -s5.9  -w1.0 -f.2 -n500 -B25 -c3 -x2 -y2 -z2 -O70</main_exec_args>
       <tags>dlsim.test1 dlsim.test5 dlsim.test6 dlsim.test6b dlsim.test7 dlsim.test7b dlsim.test10 dlsim.test10b dlsim.test11 dlsim.TM2_test1 dlsim.TM2_test1b</tags>

cmake_targets/autotests/testsuite_ue_noS1_TCL.xml

@@ -7,8 +7,8 @@
  <!-- <GitOAI5GRepo>git@gitlab.com:TCL_Communications/openairinterface5g.git</GitOAI5GRepo> -->
  <GitOpenair-cnRepo>https://gitlab.eurecom.fr/oai/openair-cn.git</GitOpenair-cnRepo> -->
  <!--<GitOAI5GRepoBranch>develop_integration_w15</GitOAI5GRepoBranch>-->
- <GitOAI5GRepoBranch>develop</GitOAI5GRepoBranch>
- <GitOAI5GHeadVersion>develop</GitOAI5GHeadVersion> -->
+ <GitOAI5GRepoBranch>eNB_phy-test_fix_20MHz</GitOAI5GRepoBranch>
+ <GitOAI5GHeadVersion>eNB_phy-test_fix_20MHz</GitOAI5GHeadVersion> -->
  <!-- <GitOAI5GHeadVersion>425b6fd525d9c4b0b3c2357926bbac5685e4b1e5</GitOAI5GHeadVersion> -->
  <!-- <GitOAI5GHeadVersion>23822ea203e00f2100fa41c7ee3084ec55b884fe</GitOAI5GHeadVersion> --> 
  <!-- <GitOAI5GHeadVersion></GitOAI5GHeadVersion>--> 
@@ -71,7 +71,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec></UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -96,59 +96,6 @@
             unit_of_meas = ""/> 
     </testCase> 
 
-<!-- ending with 3 TDD config3 TCs -->
-
- <testCase id="030003" >
-    <class>lte-softmodem-noS1</class>
-    <desc></desc>
-    <eNB>TCT-Labo1</eNB>
-    <UE>TCT-Labo3</UE>
-    <TimeOut_cmd>300</TimeOut_cmd>
-    <eNB_working_dir>/tmp</eNB_working_dir> 
-    <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
-    <eNB_compile_prog_args>-c -w USRP --eNB --noS1</eNB_compile_prog_args>
-    <eNB_pre_exec>source $OPENAIR_DIR/cmake_targets/tools/init_nas_nos1 eNB</eNB_pre_exec>
-    <eNB_pre_exec_args></eNB_pre_exec_args>
-    <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1</eNB_main_exec>
-    <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band40.tm1.TDD3SS5.25PRB.usrpb210.conf -W -m 0 --single-thread-disable --phy-test</eNB_main_exec_args>
-    <eNB_traffic_exec></eNB_traffic_exec>
-    <eNB_traffic_exec_args></eNB_traffic_exec_args>
-    <eNB_search_expr_true></eNB_search_expr_true>
-    <eNB_search_expr_false></eNB_search_expr_false>
-    <eNB_terminate_missing_procs>False</eNB_terminate_missing_procs>
-
-    <UE_working_dir>/tmp</UE_working_dir>
-    <UE_config_file></UE_config_file>
-    <UE_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</UE_compile_prog>
-    <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
-    <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
-    <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -T -C2350000000 -r25 --ue-scan-carrier --ue-txgain 80 --ue-rxgain 100  -S --phy-test</UE_main_exec>
-    <UE_main_exec_args></UE_main_exec_args>
-    <UE_traffic_exec></UE_traffic_exec>
-    <UE_traffic_exec_args></UE_traffic_exec_args>
-    <UE_search_expr_true></UE_search_expr_true>
-    <UE_search_expr_false></UE_search_expr_false>
-    <UE_terminate_missing_procs>False</UE_terminate_missing_procs>
-    <UE_metric  id="UE_DLSCH_BITRATE" 
-        description="UE downlink physical throughput"  
-        regex='(UE_DLSCH_BITRATE) =\s+(\d+\.\d+) kbps.+frame = (\d+)\)' 
-        unit_of_meas = "kbps"
-        pass_fail_stat = "mean_value"
-        min_limit = "300"/>
-    <tags>UE_USRP.NOS1.PHYTEST_PERF.BAND40.5MHZ.MCS00</tags>
-    <nruns>1</nruns><max_ntries>1</max_ntries>
-    <UE_metric  id="UE_FREQ_OFFSET" 
-            description="UE downlink frequency channel offset"  
-            regex='(UE_FREQ_OFFSET) =\s+(-?\d+) Hz.+frame = (\d+)\)' 
-            unit_of_meas = "Hz"/> 
-    <UE_metric  id="UE_RX_OFFSET" 
-            description="UE downlink rx sample offset"  
-            regex='(UE_RX_OFFSET) =\s+(-?\d+).+frame = (\d+)\)' 
-            unit_of_meas = ""/> 
-    </testCase> 
-
-
  <testCase id="030001" >
     <class>lte-softmodem-noS1</class>
     <desc></desc>
@@ -226,7 +173,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec></UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -333,7 +280,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec></UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -435,7 +382,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec></UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -537,7 +484,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec></UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -639,7 +586,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec></UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -741,7 +688,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec></UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -843,7 +790,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec></UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -946,7 +893,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec></UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -1048,7 +995,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec></UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -1150,7 +1097,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec></UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -1252,7 +1199,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec></UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -1354,7 +1301,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec></UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -1457,7 +1404,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec></UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -1559,7 +1506,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec></UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -1661,7 +1608,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec></UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -1815,7 +1762,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec></UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -1918,7 +1865,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2685000000 -r50 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2685000000 -r50 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec></UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -2021,7 +1968,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2685000000 -r50 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2685000000 -r50 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec></UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -2127,7 +2074,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2685000000 -r50 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2685000000 -r50 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -2151,54 +2098,6 @@
     </testCase> 
 
 
-  <testCase id="036133" >
-	<class>lte-softmodem-noS1</class>
-	<desc></desc>
-	<eNB>TCT-Labo1</eNB>
-	<UE>TCT-Labo3</UE>
-	<TimeOut_cmd>300</TimeOut_cmd>
-	<eNB_working_dir>/tmp</eNB_working_dir>	
-	<eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
-	<eNB_compile_prog_args>-c -w USRP --eNB --noS1 </eNB_compile_prog_args>
-	<eNB_pre_exec>source $OPENAIR_DIR/cmake_targets/tools/init_nas_nos1 eNB</eNB_pre_exec>
-	<eNB_pre_exec_args></eNB_pre_exec_args>
-	<eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1</eNB_main_exec>
-	<eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band40.tm1.TDD3SS5.50PRB.usrpb210.conf -W -m 28 </eNB_main_exec_args>
-	<eNB_traffic_exec>sleep 30;iperf -c 10.0.1.9 -i 1 -u -b 18M</eNB_traffic_exec>
-	<eNB_traffic_exec_args></eNB_traffic_exec_args>
-	<eNB_search_expr_true></eNB_search_expr_true>
-	<eNB_search_expr_false></eNB_search_expr_false>
-	<eNB_terminate_missing_procs>False</eNB_terminate_missing_procs>
-
-	<UE_working_dir>/tmp</UE_working_dir>
-	<UE_config_file></UE_config_file>
-	<UE_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</UE_compile_prog>
-	<UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
-	<UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
-	<UE_pre_exec_args></UE_pre_exec_args>
-	<UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -T -C2350000000 -r50 --ue-scan-carrier --ue-txgain 80 --ue-rxgain 100  -S</UE_main_exec>
-	<UE_main_exec_args></UE_main_exec_args>
-	<UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
-	<UE_traffic_exec_args></UE_traffic_exec_args>
-	<UE_search_expr_true>200</UE_search_expr_true>
-	<UE_search_expr_false></UE_search_expr_false>
-	<UE_terminate_missing_procs>False</UE_terminate_missing_procs>
-	<tags>UE_USRP.NOS1.DATA_IPERF.BAND40.10MHZ.MCS28</tags>
-	<nruns>3</nruns><max_ntries>6</max_ntries>
-	<UE_metric  id="UE_DLSCH_BITRATE" 
-	    description="UE downlink physical throughput"  
-	    regex='(UE_DLSCH_BITRATE) =\s+(\d+\.\d+) kbps.+frame = (\d+)\)' 
-	    unit_of_meas = "kbps"/> 
-	<UE_metric  id="UE_FREQ_OFFSET" 
-	    description="UE downlink frequency channel offset"  
-	    regex='(UE_FREQ_OFFSET) =\s+(-?\d+) Hz.+frame = (\d+)\)' 
-	    unit_of_meas = "Hz"/> 
-	<UE_metric  id="UE_RX_OFFSET" 
-	    description="UE downlink rx sample offset"  
-	    regex='(UE_RX_OFFSET) =\s+(-?\d+).+frame = (\d+)\)' 
-	unit_of_meas = ""/> 
-  </testCase> 
-
 
 
 
@@ -2542,7 +2441,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -2619,8 +2518,7 @@
     <!-- USRP Band 7 5MHz SISO Iperf downlink performances -->
     <!-- 030030 030930 031030 031630 031730 031930 032730 032830 -->
 
-
-    <testCase id="030003" >
+    <testCase id="030030" >
         <class>lte-softmodem-noS1</class>
         <desc></desc>
         <eNB>TCT-Labo1</eNB>
@@ -2646,7 +2544,7 @@
         <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
         <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
         <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S</UE_main_exec>
+        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S</UE_main_exec>
         <UE_main_exec_args></UE_main_exec_args>
         <UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
         <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -2670,54 +2568,6 @@
     </testCase> 
 
 
-    <testCase id="030033" >
-        <class>lte-softmodem-noS1</class>
-        <desc></desc>
-        <eNB>TCT-Labo1</eNB>
-        <UE>TCT-Labo3</UE>
-        <TimeOut_cmd>300</TimeOut_cmd>
-        <eNB_working_dir>/tmp</eNB_working_dir>
-        <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
-        <eNB_compile_prog_args>-c -w USRP --eNB --noS1</eNB_compile_prog_args>
-        <eNB_pre_exec>source $OPENAIR_DIR/cmake_targets/tools/init_nas_nos1 eNB</eNB_pre_exec>
-        <eNB_pre_exec_args></eNB_pre_exec_args>
-        <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1</eNB_main_exec>
-        <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band40.tm1.TDD3SS5.25PRB.usrpb210.conf -W -m 0 </eNB_main_exec_args>
-        <eNB_traffic_exec>sleep 80;iperf -c 10.0.1.9 -i 1 -u -b 300K</eNB_traffic_exec>
-        <eNB_traffic_exec_args></eNB_traffic_exec_args>
-        <eNB_search_expr_true></eNB_search_expr_true>
-        <eNB_search_expr_false></eNB_search_expr_false>
-        <eNB_terminate_missing_procs>False</eNB_terminate_missing_procs>
-
-        <UE_working_dir>/tmp</UE_working_dir>
-        <UE_config_file></UE_config_file>
-        <UE_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</UE_compile_prog>
-        <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
-        <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
-        <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -T -C2350000000 -r25 --ue-scan-carrier --ue-txgain 80 --ue-rxgain 100  -S</UE_main_exec>
-        <UE_main_exec_args></UE_main_exec_args>
-        <UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
-        <UE_traffic_exec_args></UE_traffic_exec_args>
-        <UE_search_expr_true>200</UE_search_expr_true>
-        <UE_search_expr_false></UE_search_expr_false>
-        <UE_terminate_missing_procs>False</UE_terminate_missing_procs>
-        <tags>UE_USRP.NOS1.DATA_IPERF.BAND40.5MHZ.MCS00</tags>
-        <nruns>3</nruns><max_ntries>6</max_ntries>
-        <UE_metric  id="UE_DLSCH_BITRATE" 
-                description="UE downlink physical throughput"  
-                regex='(UE_DLSCH_BITRATE) =\s+(\d+\.\d+) kbps.+frame = (\d+)\)' 
-                unit_of_meas = "kbps"/> 
-        <UE_metric  id="UE_FREQ_OFFSET" 
-                description="UE downlink frequency channel offset"  
-                regex='(UE_FREQ_OFFSET) =\s+(-?\d+) Hz.+frame = (\d+)\)' 
-                unit_of_meas = "Hz"/> 
-        <UE_metric  id="UE_RX_OFFSET" 
-                description="UE downlink rx sample offset"  
-                regex='(UE_RX_OFFSET) =\s+(-?\d+).+frame = (\d+)\)' 
-                unit_of_meas = ""/> 
-    </testCase> 
-
 
     <testCase id="030930" >
         <class>lte-softmodem-noS1</class>
@@ -2745,7 +2595,7 @@
         <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
         <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
         <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100 -S</UE_main_exec>
+        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100 -S</UE_main_exec>
         <UE_main_exec_args></UE_main_exec_args>
         <UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
         <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -2795,7 +2645,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -2846,7 +2696,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -2869,54 +2719,6 @@
             unit_of_meas = ""/> 
     </testCase> 
     
-
-    <testCase id="031633" >
-        <class>lte-softmodem-noS1</class>
-        <desc></desc>
-        <eNB>TCT-Labo1</eNB>
-        <UE>TCT-Labo3</UE>
-        <TimeOut_cmd>300</TimeOut_cmd>
-        <eNB_working_dir>/tmp</eNB_working_dir>
-        <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
-        <eNB_compile_prog_args>-c -w USRP --eNB --noS1</eNB_compile_prog_args>
-        <eNB_pre_exec>source $OPENAIR_DIR/cmake_targets/tools/init_nas_nos1 eNB</eNB_pre_exec>
-        <eNB_pre_exec_args></eNB_pre_exec_args>
-        <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1</eNB_main_exec>
-        <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band40.tm1.TDD3SS5.25PRB.usrpb210.conf -W -m 0 </eNB_main_exec_args>
-        <eNB_traffic_exec>sleep 80;iperf -c 10.0.1.9 -i 1 -u -b 1200K</eNB_traffic_exec>
-        <eNB_traffic_exec_args></eNB_traffic_exec_args>
-        <eNB_search_expr_true></eNB_search_expr_true>
-        <eNB_search_expr_false></eNB_search_expr_false>
-        <eNB_terminate_missing_procs>False</eNB_terminate_missing_procs>
-
-        <UE_working_dir>/tmp</UE_working_dir>
-        <UE_config_file></UE_config_file>
-        <UE_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</UE_compile_prog>
-        <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
-        <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
-        <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -T -C2350000000 -r25 --ue-scan-carrier --ue-txgain 80 --ue-rxgain 100  -S</UE_main_exec>
-        <UE_main_exec_args></UE_main_exec_args>
-        <UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
-        <UE_traffic_exec_args></UE_traffic_exec_args>
-        <UE_search_expr_true>200</UE_search_expr_true>
-        <UE_search_expr_false></UE_search_expr_false>
-        <UE_terminate_missing_procs>False</UE_terminate_missing_procs>
-        <tags>UE_USRP.NOS1.DATA_IPERF.BAND40.5MHZ.MCS16</tags>
-        <nruns>3</nruns><max_ntries>6</max_ntries>
-        <UE_metric  id="UE_DLSCH_BITRATE" 
-                description="UE downlink physical throughput"  
-                regex='(UE_DLSCH_BITRATE) =\s+(\d+\.\d+) kbps.+frame = (\d+)\)' 
-                unit_of_meas = "kbps"/> 
-        <UE_metric  id="UE_FREQ_OFFSET" 
-                description="UE downlink frequency channel offset"  
-                regex='(UE_FREQ_OFFSET) =\s+(-?\d+) Hz.+frame = (\d+)\)' 
-                unit_of_meas = "Hz"/> 
-        <UE_metric  id="UE_RX_OFFSET" 
-                description="UE downlink rx sample offset"  
-                regex='(UE_RX_OFFSET) =\s+(-?\d+).+frame = (\d+)\)' 
-                unit_of_meas = ""/> 
-    </testCase> 
     
  <testCase id="031730" >
     <class>lte-softmodem-noS1</class>
@@ -2944,7 +2746,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -2994,7 +2796,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S</UE_main_exec>
+    <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S</UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -3044,7 +2846,7 @@
     <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
     <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
-    <UE_main_exec>sleep 5; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S </UE_main_exec>
+    <UE_main_exec>sleep 5; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S </UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
     <UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
     <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -3103,7 +2905,7 @@
         <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
         <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
         <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
         <UE_main_exec_args></UE_main_exec_args>
         <UE_traffic_exec></UE_traffic_exec>
         <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -3154,7 +2956,7 @@
         <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
         <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
         <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
+        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S --phy-test</UE_main_exec>
         <UE_main_exec_args></UE_main_exec_args>
         <UE_traffic_exec></UE_traffic_exec>
         <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -3206,7 +3008,7 @@
         <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
         <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
         <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 5; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100 -S </UE_main_exec>
+        <UE_main_exec>sleep 5; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100 -S </UE_main_exec>
         <UE_main_exec_args></UE_main_exec_args>
         <UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
         <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -3235,55 +3037,6 @@
     </testCase> 
 
 
-     <testCase id="032833" >
-	<class>lte-softmodem-noS1</class>
-	<desc></desc>
-	<eNB>TCT-Labo1</eNB>
-	<UE>TCT-Labo3</UE>
-	<TimeOut_cmd>300</TimeOut_cmd>
-	<eNB_working_dir>/tmp</eNB_working_dir>
-	<eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
-	<eNB_compile_prog_args>-c -w USRP --eNB --noS1 </eNB_compile_prog_args>
-	<eNB_pre_exec>source $OPENAIR_DIR/cmake_targets/tools/init_nas_nos1 eNB</eNB_pre_exec>
-	<eNB_pre_exec_args></eNB_pre_exec_args>
-	<eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1</eNB_main_exec>
-	<eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band40.tm1.TDD3SS5.25PRB.usrpb210.conf -W -m 28 </eNB_main_exec_args>
-	<eNB_traffic_exec>sleep 30;iperf -c 10.0.1.9 -i 1 -u -b 8220K</eNB_traffic_exec>
-	<eNB_traffic_exec_args></eNB_traffic_exec_args>
-	<eNB_search_expr_true></eNB_search_expr_true>
-	<eNB_search_expr_false></eNB_search_expr_false>
-	<eNB_terminate_missing_procs>False</eNB_terminate_missing_procs>
-
-	<UE_working_dir>/tmp</UE_working_dir>
-	<UE_config_file></UE_config_file>
-	<UE_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</UE_compile_prog>
-	<UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
-	<UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
-	<UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -T -C2350000000 -r25 --ue-scan-carrier --ue-txgain 80 --ue-rxgain 100  -S</UE_main_exec>
-	<UE_main_exec_args></UE_main_exec_args>
-	<UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
-	<UE_traffic_exec_args></UE_traffic_exec_args>
-	<UE_search_expr_true>200</UE_search_expr_true>
-	<UE_search_expr_false></UE_search_expr_false>
-	<UE_terminate_missing_procs>False</UE_terminate_missing_procs>
-        <tags>UE_USRP.NOS1.DATA_IPERF.BAND40.5MHZ.MCS28</tags>
-	<nruns>3</nruns><max_ntries>6</max_ntries>
-	<UE_metric  id="UE_DLSCH_BITRATE" 
-	    description="UE downlink physical throughput"  
-	    regex='(UE_DLSCH_BITRATE) =\s+(\d+\.\d+) kbps.+frame = (\d+)\)' 
-	    unit_of_meas = "kbps"/> 
-	<UE_metric  id="UE_FREQ_OFFSET" 
-	    description="UE downlink frequency channel offset"  
-	    regex='(UE_FREQ_OFFSET) =\s+(-?\d+) Hz.+frame = (\d+)\)' 
-	    unit_of_meas = "Hz"/> 
-	<UE_metric  id="UE_RX_OFFSET" 
-	    description="UE downlink rx sample offset"  
-	    regex='(UE_RX_OFFSET) =\s+(-?\d+).+frame = (\d+)\)' 
-    unit_of_meas = ""/> 
-    </testCase> 
-
-
     <testCase id="032840" >
         <class>lte-softmodem-noS1</class>
         <desc></desc>
@@ -3313,7 +3066,7 @@
         <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
         <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
         <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S</UE_main_exec>
+        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S</UE_main_exec>
         <UE_main_exec_args></UE_main_exec_args>
         <UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
         <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -3363,7 +3116,7 @@
         <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
         <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
         <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 5; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100 -S </UE_main_exec>
+        <UE_main_exec>sleep 5; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100 -S </UE_main_exec>
         <UE_main_exec_args></UE_main_exec_args>
         <UE_traffic_exec>iperf -s -i 1</UE_traffic_exec>
         <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -3418,7 +3171,7 @@
         <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
         <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
         <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2685000000 -r50 --ue-scan-carrier --ue-txgain 80 -A 24 --ue-rxgain 100  -S</UE_main_exec>
+        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2685000000 -r50 --ue-scan-carrier --ue-txgain 85 -A 24 --ue-rxgain 100  -S</UE_main_exec>
         <UE_main_exec_args></UE_main_exec_args>
         <UE_traffic_exec>iperf -s -i 1</UE_traffic_exec>
         <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -3475,7 +3228,7 @@
         <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
         <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
         <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2680000000 -r100 --ue-scan-carrier --ue-txgain 80 --ue-rxgain 100 -S --phy-test</UE_main_exec>
+        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2680000000 -r100 --ue-scan-carrier --ue-txgain 85 --ue-rxgain 100 -S --phy-test</UE_main_exec>
         <UE_main_exec_args></UE_main_exec_args>
         <UE_traffic_exec></UE_traffic_exec>
         <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -3501,9 +3254,6 @@
     </testCase> 
 
 
-
-
-
  <testCase id="036600" >
         <class>lte-softmodem-noS1</class>
         <desc></desc>
@@ -3530,7 +3280,7 @@
         <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
         <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
         <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2680000000 -r100 --ue-scan-carrier --ue-txgain 80 --ue-rxgain 100 -S --phy-test</UE_main_exec>
+        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2680000000 -r100 --ue-scan-carrier --ue-txgain 85 --ue-rxgain 100 -S --phy-test</UE_main_exec>
         <UE_main_exec_args></UE_main_exec_args>
         <UE_traffic_exec></UE_traffic_exec>
         <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -3582,7 +3332,7 @@
         <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
         <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
         <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2680000000 -r100 --ue-scan-carrier --ue-txgain 80 --ue-rxgain 100 -S --phy-test</UE_main_exec>
+        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2680000000 -r100 --ue-scan-carrier --ue-txgain 85 --ue-rxgain 100 -S --phy-test</UE_main_exec>
         <UE_main_exec_args></UE_main_exec_args>
         <UE_traffic_exec></UE_traffic_exec>
         <UE_traffic_exec_args></UE_traffic_exec_args>
@@ -3623,7 +3373,7 @@
         <eNB_pre_exec_args></eNB_pre_exec_args>
         <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1</eNB_main_exec>
         <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpb210.conf -m 0</eNB_main_exec_args>
-        <eNB_traffic_exec>sleep 60;iperf -c 10.0.1.9 -i 1 -u -b 2M</eNB_traffic_exec> 
+        <eNB_traffic_exec>sleep 80;iperf -c 10.0.1.9 -i 1 -u -b 2M</eNB_traffic_exec> 
         <eNB_traffic_exec_args></eNB_traffic_exec_args>
         <eNB_search_expr_true></eNB_search_expr_true>
         <eNB_search_expr_false></eNB_search_expr_false>
@@ -3635,11 +3385,11 @@
         <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
         <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
         <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2680000000 -r100 --ue-scan-carrier --ue-txgain 80 --ue-rxgain 100 </UE_main_exec>
+        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2680000000 -r100 --ue-scan-carrier --ue-txgain 85 --ue-rxgain 100 </UE_main_exec>
         <UE_main_exec_args></UE_main_exec_args>
         <UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
         <UE_traffic_exec_args></UE_traffic_exec_args>
-        <UE_search_expr_true>200</UE_search_expr_true>
+        <UE_search_expr_true>600</UE_search_expr_true>
         <UE_search_expr_false></UE_search_expr_false>
         <UE_terminate_missing_procs>False</UE_terminate_missing_procs>
         <UE_metric  id="UE_DLSCH_BITRATE" 
@@ -3673,7 +3423,7 @@
         <eNB_pre_exec_args></eNB_pre_exec_args>
         <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1</eNB_main_exec>
         <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpb210.conf -m 18</eNB_main_exec_args>
-        <eNB_traffic_exec>sleep 60;iperf -c 10.0.1.9 -i 1 -u -b 24M</eNB_traffic_exec> 
+        <eNB_traffic_exec>sleep 80;iperf -c 10.0.1.9 -i 1 -u -b 24M</eNB_traffic_exec> 
         <eNB_traffic_exec_args></eNB_traffic_exec_args>
         <eNB_search_expr_true></eNB_search_expr_true>
         <eNB_search_expr_false></eNB_search_expr_false>
@@ -3685,11 +3435,11 @@
         <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
         <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
         <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2680000000 -r100 --ue-scan-carrier --ue-txgain 80 --ue-rxgain 100 </UE_main_exec>
+        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2680000000 -r100 --ue-scan-carrier --ue-txgain 85 --ue-rxgain 100 </UE_main_exec>
         <UE_main_exec_args></UE_main_exec_args>
         <UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
         <UE_traffic_exec_args></UE_traffic_exec_args>
-        <UE_search_expr_true>200</UE_search_expr_true>
+        <UE_search_expr_true>600</UE_search_expr_true>
         <UE_search_expr_false></UE_search_expr_false>
         <UE_terminate_missing_procs>False</UE_terminate_missing_procs>
         <UE_metric  id="UE_DLSCH_BITRATE" 
@@ -3724,7 +3474,7 @@
         <eNB_pre_exec_args></eNB_pre_exec_args>
         <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1</eNB_main_exec>
         <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpb210.conf -m 28</eNB_main_exec_args>
-        <eNB_traffic_exec>sleep 60;iperf -c 10.0.1.9 -i 1 -u -b 55M</eNB_traffic_exec> <!-- PHY max TP 73.334Mbps -> 75% = 55Mbps -->
+        <eNB_traffic_exec>sleep 80;iperf -c 10.0.1.9 -i 1 -u -b 55M</eNB_traffic_exec> <!-- PHY max TP 73.334Mbps -> 75% = 55Mbps -->
         <eNB_traffic_exec_args></eNB_traffic_exec_args>
         <eNB_search_expr_true></eNB_search_expr_true>
         <eNB_search_expr_false></eNB_search_expr_false>
@@ -3736,11 +3486,11 @@
         <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
         <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
         <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2680000000 -r100 --ue-scan-carrier --ue-txgain 80 --ue-rxgain 100 </UE_main_exec>
+        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2680000000 -r100 --ue-scan-carrier --ue-txgain 85 --ue-rxgain 100 </UE_main_exec>
         <UE_main_exec_args></UE_main_exec_args>
         <UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
         <UE_traffic_exec_args></UE_traffic_exec_args>
-        <UE_search_expr_true>200</UE_search_expr_true>
+        <UE_search_expr_true>600</UE_search_expr_true>
         <UE_search_expr_false></UE_search_expr_false>
         <UE_terminate_missing_procs>False</UE_terminate_missing_procs>
         <UE_metric  id="UE_DLSCH_BITRATE" 
@@ -3759,53 +3509,7 @@
 	<nruns>3</nruns><max_ntries>6</max_ntries>
     </testCase> 
 
-  <testCase id="039433" >
-	<class>lte-softmodem-noS1</class>
-	<desc></desc>
-	<eNB>TCT-Labo1</eNB>
-	<UE>TCT-Labo3</UE>
-	<TimeOut_cmd>300</TimeOut_cmd>
-	<eNB_working_dir>/tmp</eNB_working_dir>	
-	<eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
-	<eNB_compile_prog_args>-c -w USRP --eNB --noS1 </eNB_compile_prog_args>
-	<eNB_pre_exec>source $OPENAIR_DIR/cmake_targets/tools/init_nas_nos1 eNB</eNB_pre_exec>
-	<eNB_pre_exec_args></eNB_pre_exec_args>
-	<eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1</eNB_main_exec>
-	<eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band40.tm1.TDD3SS5.100PRB.usrpb210.conf -W -m 28 </eNB_main_exec_args>
-	<eNB_traffic_exec>sleep 30;iperf -c 10.0.1.9 -i 1 -u -b 33M</eNB_traffic_exec>
-	<eNB_traffic_exec_args></eNB_traffic_exec_args>
-	<eNB_search_expr_true></eNB_search_expr_true>
-	<eNB_search_expr_false></eNB_search_expr_false>
-	<eNB_terminate_missing_procs>False</eNB_terminate_missing_procs>
 
-	<UE_working_dir>/tmp</UE_working_dir>
-	<UE_config_file></UE_config_file>
-	<UE_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</UE_compile_prog>
-	<UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
-	<UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
-	<UE_pre_exec_args></UE_pre_exec_args>
-	<UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -T -C2350000000 -r100 --ue-scan-carrier --ue-txgain 80 --ue-rxgain 100  -S</UE_main_exec>
-	<UE_main_exec_args></UE_main_exec_args>
-	<UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
-	<UE_traffic_exec_args></UE_traffic_exec_args>
-	<UE_search_expr_true>200</UE_search_expr_true>
-	<UE_search_expr_false></UE_search_expr_false>
-	<UE_terminate_missing_procs>False</UE_terminate_missing_procs>
-	<tags>UE_USRP.NOS1.DATA_IPERF.BAND40.20MHZ.MCS28</tags>
-	<nruns>3</nruns><max_ntries>6</max_ntries>
-	<UE_metric  id="UE_DLSCH_BITRATE" 
-	    description="UE downlink physical throughput"  
-	    regex='(UE_DLSCH_BITRATE) =\s+(\d+\.\d+) kbps.+frame = (\d+)\)' 
-	    unit_of_meas = "kbps"/> 
-	<UE_metric  id="UE_FREQ_OFFSET" 
-	    description="UE downlink frequency channel offset"  
-	    regex='(UE_FREQ_OFFSET) =\s+(-?\d+) Hz.+frame = (\d+)\)' 
-	    unit_of_meas = "Hz"/> 
-	<UE_metric  id="UE_RX_OFFSET" 
-	    description="UE downlink rx sample offset"  
-	    regex='(UE_RX_OFFSET) =\s+(-?\d+).+frame = (\d+)\)' 
-	unit_of_meas = ""/> 
-  </testCase> 
 
 
   </testCaseList>

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

cmake_targets/autotests/v2/actions/3276.txt

@@ -1,13 +0,0 @@
-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/alu_hss.bash

@@ -1,5 +1,4 @@
 sudo rmmod nasmesh || true
 sudo rmmod ue_ip || true
 sudo /opt/ltebox/tools/stop_ltebox || true
-sudo killall -9 hss_sim || true
 sudo /opt/hss_sim0609/starthss_real

cmake_targets/autotests/v2/actions/bandrich.txt

@@ -13,16 +13,6 @@ 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/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.10MHz.conf

@@ -47,7 +47,7 @@ eNBs =
         prach_zero_correlation  			      = 1;
         prach_freq_offset       			      = 2;
         pucch_delta_shift       			      = 1;
-        pucch_nRB_CQI           			      = 0;
+        pucch_nRB_CQI           			      = 1;
         pucch_nCS_AN            			      = 0;
         pucch_n1_AN             			      = 32;
         pdsch_referenceSignalPower 			      = -24;

cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.20MHz.conf

@@ -47,7 +47,7 @@ eNBs =
         prach_zero_correlation  			      = 1;
         prach_freq_offset       			      = 2;
         pucch_delta_shift       			      = 1;
-        pucch_nRB_CQI           			      = 0;
+        pucch_nRB_CQI           			      = 1;
         pucch_nCS_AN            			      = 0;
         pucch_n1_AN             			      = 32;
         pdsch_referenceSignalPower 			      = -24;

cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.5MHz.conf

@@ -47,7 +47,7 @@ eNBs =
         prach_zero_correlation  			      = 1;
         prach_freq_offset       			      = 2;
         pucch_delta_shift       			      = 1;
-        pucch_nRB_CQI           			      = 0;
+        pucch_nRB_CQI           			      = 1;
         pucch_nCS_AN            			      = 0;
         pucch_n1_AN             			      = 32;
         pdsch_referenceSignalPower 			      = -24;

cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.10MHz.conf

@@ -47,7 +47,7 @@ eNBs =
         prach_zero_correlation  			      = 1;
         prach_freq_offset       			      = 2;
         pucch_delta_shift       			      = 1;
-        pucch_nRB_CQI           			      = 0;
+        pucch_nRB_CQI           			      = 1;
         pucch_nCS_AN            			      = 0;
         pucch_n1_AN             			      = 32;
         pdsch_referenceSignalPower 			      = -24;

cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.20MHz.conf

@@ -47,7 +47,7 @@ eNBs =
         prach_zero_correlation  			      = 1;
         prach_freq_offset       			      = 2;
         pucch_delta_shift       			      = 1;
-        pucch_nRB_CQI           			      = 0;
+        pucch_nRB_CQI           			      = 1;
         pucch_nCS_AN            			      = 0;
         pucch_n1_AN             			      = 32;
         pdsch_referenceSignalPower 			      = -24;

cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.5MHz.conf

@@ -47,7 +47,7 @@ eNBs =
         prach_zero_correlation  			      = 1;
         prach_freq_offset       			      = 2;
         pucch_delta_shift       			      = 1;
-        pucch_nRB_CQI           			      = 0;
+        pucch_nRB_CQI           			      = 1;
         pucch_nCS_AN            			      = 0;
         pucch_n1_AN             			      = 32;
         pdsch_referenceSignalPower 			      = -24;

cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf

@@ -47,7 +47,7 @@ eNBs =
       prach_zero_correlation  			      = 1;
       prach_freq_offset       			      = 2;
       pucch_delta_shift       			      = 1;
-      pucch_nRB_CQI           			      = 0;
+      pucch_nRB_CQI           			      = 1;
       pucch_nCS_AN            			      = 0;
       pucch_n1_AN             			      = 32;
       pdsch_referenceSignalPower 			      = -29;

cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf

@@ -47,7 +47,7 @@ eNBs =
       prach_zero_correlation  			      = 1;
       prach_freq_offset       			      = 2;
       pucch_delta_shift       			      = 1;
-      pucch_nRB_CQI           			      = 0;
+      pucch_nRB_CQI           			      = 1;
       pucch_nCS_AN            			      = 0;
       pucch_n1_AN             			      = 32;
       pdsch_referenceSignalPower 			      = -29;

cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf

@@ -47,7 +47,7 @@ eNBs =
       prach_zero_correlation  			      = 1;
       prach_freq_offset       			      = 2;
       pucch_delta_shift       			      = 1;
-      pucch_nRB_CQI           			      = 0;
+      pucch_nRB_CQI           			      = 1;
       pucch_nCS_AN            			      = 0;
       pucch_n1_AN             			      = 32;
       pdsch_referenceSignalPower 			      = -29;

cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf

@@ -47,7 +47,7 @@ eNBs =
       prach_zero_correlation  			      = 1;
       prach_freq_offset       			      = 2;
       pucch_delta_shift       			      = 1;
-      pucch_nRB_CQI           			      = 0;
+      pucch_nRB_CQI           			      = 1;
       pucch_nCS_AN            			      = 0;
       pucch_n1_AN             			      = 32;
       pdsch_referenceSignalPower 			      = -29;

cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf

@@ -47,7 +47,7 @@ eNBs =
       prach_zero_correlation  			      = 1;
       prach_freq_offset       			      = 2;
       pucch_delta_shift       			      = 1;
-      pucch_nRB_CQI           			      = 0;
+      pucch_nRB_CQI           			      = 1;
       pucch_nCS_AN            			      = 0;
       pucch_n1_AN             			      = 32;
       pdsch_referenceSignalPower 			      = -29;

cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf

@@ -47,7 +47,7 @@ eNBs =
       prach_zero_correlation  			      = 1;
       prach_freq_offset       			      = 2;
       pucch_delta_shift       			      = 1;
-      pucch_nRB_CQI           			      = 0;
+      pucch_nRB_CQI           			      = 1;
       pucch_nCS_AN            			      = 0;
       pucch_n1_AN             			      = 32;
       pdsch_referenceSignalPower 			      = -29;

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.1  (the "License"); you may not use this file
+# * 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
 # *
@@ -43,7 +43,6 @@ conf_nvram_path=$OPENAIR_DIR/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
 MSC_GEN="False"
 XFORMS="True"
 FLEXRAN_AGENT_SB_IF="True"
-UE_EXPANSION="False"
 PRINT_STATS="False"
 VCD_TIMING="False"
 DEADLINE_SCHEDULER_FLAG_USER="False"
@@ -62,13 +61,9 @@ BUILD_DOXYGEN=0
 T_TRACER="False"
 DISABLE_HARDWARE_DEPENDENCY="False"
 CMAKE_BUILD_TYPE=""
-CMAKE_CMD="$CMAKE"
 UE_AUTOTEST_TRACE="False"
-UE_DEBUG_TRACE="False"
-UE_TIMING_TRACE="False"
-DISABLE_LOG_X="False"
-USRP_REC_PLAY="False"
 BUILD_ECLIPSE=0
+CMAKE_CMD='cmake'
 trap handle_ctrl_c INT
 
 function print_help() {
@@ -152,16 +147,8 @@ Options
    Disable HW dependency during installation
 --ue-autotest-trace
     Enable specific traces for UE autotest framework
---ue-trace
-    Enable traces for UE debugging
---ue-timing
-    Enable traces for timing
---disable-log
-   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
 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
@@ -214,10 +201,6 @@ function main() {
             UE=1
             echo_info "Will compile UE"
             shift;;
-       --mu)
-            UE_EXPANSION="True"
-            echo_info "Will compile with UE_EXPANSION"
-            shift;;
        --UE-conf-nvram)
             conf_nvram_path=$(readlink -f "$1")
             shift 2;;
@@ -333,18 +316,6 @@ function main() {
             UE_AUTOTEST_TRACE="True"
             echo_info "Enabling autotest specific trace for UE"
             shift 1;;
-        --ue-trace)
-            UE_DEBUG_TRACE="True"
-            echo_info "Enabling UE trace for debug"
-            shift 1;;
-        --ue-timing)
-            UE_TIMING_TRACE="True"
-            echo_info "Enabling UE timing trace"
-            shift 1;;
-        --disable-log)
-            DISABLE_LOG_X="True"
-            echo_info "Disabling all LOG_* traces"
-            shift 1;;
         --uhd-images-dir)
             UHD_IMAGES_DIR=$2
             echo_info "Downloading UHD images in the indicated location"
@@ -353,15 +324,7 @@ 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;;
-       --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;;
+            shift 1;;			
         -h | --help)
             print_help
             exit 1;;
@@ -485,11 +448,6 @@ function main() {
         flash_firmware_bladerf
       fi
     fi
-    if [ "$FLEXRAN_AGENT" == "1" ] ; then
-      echo_info "installing protobuf/protobuf-c for flexran agent support"
-      install_protobuf_from_source
-      install_protobuf_c_from_source
-    fi
   fi
 
   if [ "$INSTALL_OPTIONAL" = "1" ] ; then
@@ -520,9 +478,6 @@ 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
 
@@ -540,7 +495,6 @@ function main() {
     if [ "$FLEXRAN_AGENT" = "1" ] ; then
 	echo "set ( FLEXRAN_AGENT_SB_IF $FLEXRAN_AGENT_SB_IF )"      >>  $cmake_file
     fi
-    echo "set ( UE_EXPANSION $UE_EXPANSION )"      >>  $cmake_file
     echo "set ( RRC_ASN1_VERSION \"${REL}\")"      >>  $cmake_file
     echo "set ( ENABLE_VCD_FIFO $VCD_TIMING )"     >>  $cmake_file
     echo "set ( RF_BOARD \"${HW}\")"               >>  $cmake_file
@@ -550,10 +504,6 @@ function main() {
     echo "set (CPU_AFFINITY \"${CPU_AFFINITY_FLAG_USER}\" )"      >>$cmake_file
     echo "set ( T_TRACER $T_TRACER )"              >>  $cmake_file
     echo "set (UE_AUTOTEST_TRACE $UE_AUTOTEST_TRACE)"        >>  $cmake_file
-    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
     if [ "$UE" = 1 -a "$NOS1" = "0" ] ; then
      echo_info "Compiling UE S1 build : enabling Linux and NETLINK"
      echo "set (LINUX True )"              >>  $cmake_file
@@ -570,11 +520,6 @@ 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 \
@@ -703,7 +648,6 @@ function main() {
     if [ "$FLEXRAN_AGENT" = "1" ] ; then
 	echo "set ( FLEXRAN_AGENT_SB_IF $FLEXRAN_AGENT_SB_IF )"      >>  $cmake_file
     fi
-    echo "set ( UE_EXPANSION $UE_EXPANSION )"      >>  $cmake_file
     echo "set ( PRINT_STATS $PRINT_STATS )" >>  $cmake_file
     echo "set ( RRC_ASN1_VERSION \"${REL}\")" >>  $cmake_file
     echo "set ( ENABLE_VCD_FIFO $VCD_TIMING )" >>  $cmake_file
@@ -787,7 +731,6 @@ function main() {
     if [ "$FLEXRAN_AGENT" = "1" ] ; then
 	echo "set ( FLEXRAN_AGENT_SB_IF $FLEXRAN_AGENT_SB_IF )"      >>  $cmake_file
     fi
-    echo "set ( UE_EXPANSION $UE_EXPANSION )"      >>  $cmake_file
     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
@@ -831,22 +774,7 @@ 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
@@ -872,9 +800,11 @@ 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
-              compilations \
-                  $build_dir oai_usrpdevif \
-                  liboai_usrpdevif.so $dbin/liboai_usrpdevif.so.$REL
+	      if [ -d "/usr/include/uhd" ] ; then
+		  compilations \
+		      $build_dir oai_usrpdevif \
+		      liboai_usrpdevif.so $dbin/liboai_usrpdevif.so.$REL
+	      fi
 
 	      ln -sf liboai_usrpdevif.so liboai_device.so
 	      ln -sf $dbin/liboai_usrpdevif.so.$REL $dbin/liboai_device.so

cmake_targets/lte-simulators/CMakeLists.txt

@@ -3,7 +3,7 @@ set(PACKAGE_NAME "unitary_tests_simulators")
 set(PHYSIM True)
 set(RF_BOARD None)
 set(XFORMS True)
-set(ENABLE_ITTI False)
+
 set(DEBUG_PHY False)
 set(MU_RECIEVER False)
 set(RANDOM_BF False)

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.1  (the "License"); you may not use this file
+ * 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
  *

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.1  (the "License"); you may not use this file
+# * 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
 # *
@@ -24,22 +24,6 @@
 # authors Laurent Thomas, Lionel GAUTHIER
 #
 #######################################
-if [ ! -f /etc/os-release ]; then
-  echo "No /etc/os-release file found. You're likely on an unsupported distro."
-  exit -1
-fi
-OS_DISTRO=$(grep "^ID=" /etc/os-release | sed "s/ID=//" | sed "s/\"//g")
-OS_RELEASE=$(grep "^VERSION_ID=" /etc/os-release | sed "s/VERSION_ID=//" | sed "s/\"//g")
-case "$OS_DISTRO" in
-  fedora) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;;
-  rhel)   OS_BASEDISTRO="fedora"; INSTALLER="yum"; CMAKE="cmake3" ;;
-  centos) OS_BASEDISTRO="fedora"; INSTALLER="yum"; CMAKE="cmake3" ;;
-  debian) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;;
-  ubuntu) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;;
-esac
-KERNEL_VERSION=$(uname -r | cut -d '.' -f1)
-KERNEL_MAJOR=$(uname -r | cut -d '.' -f2)
-
 SUDO='sudo -E'
 
 ###############################
@@ -82,11 +66,12 @@ echo_info()    { cecho "$*" $blue         ;}
 # If we can't check the distribution, it returns "Unknown"
 # This function return always true as exit code by design
 # Examples:
-#   ubuntu16.04
-#   debian8.5
+#   Ubuntu16.04
+#   Debian8.5
 get_distribution_release() {
-    if [[ ! -z "$OS_DISTRO$OS_RELEASE" ]]; then
-        echo "$OS_DISTRO$OS_RELEASE"
+    local distributor
+    if distributor=$(lsb_release -si 2>/dev/null) ; then
+        echo $distributor$(lsb_release -sr)
     else
         echo Unknown
     fi
@@ -95,11 +80,8 @@ get_distribution_release() {
 check_supported_distribution() {
     local distribution=$(get_distribution_release)
     case "$distribution" in
-        "ubuntu16.04") return 0 ;;
-        "ubuntu14.04") return 0 ;;
-        "fedora24")    return 0 ;;
-        "rhel7")       return 0 ;;
-        "centos7")     return 0 ;;
+        "Ubuntu16.04") return 0 ;;
+        "Ubuntu14.04") return 0 ;;
     esac
     return 1
 }
@@ -202,14 +184,10 @@ install_protobuf_from_source(){
     (
     cd /tmp
     echo "Downloading protobuf"
-    #rm -rf /tmp/protobuf-2.6.1.tar.gz* /tmp/protobuf-2.6.1
-    #wget https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz
-    #tar -xzvf protobuf-2.6.1.tar.gz --owner $USER --group $USER --no-same-owner
-    #cd protobuf-2.6.1/
-    rm -rf /tmp/protobuf-cpp-3.3.0.tar.gz* /tmp/protobuf-3.3.0
-    wget https://github.com/google/protobuf/releases/download/v3.3.0/protobuf-cpp-3.3.0.tar.gz
-    tar -xzvf protobuf-cpp-3.3.0.tar.gz --owner $USER --group $USER --no-same-owner
-    cd protobuf-3.3.0/
+    rm -rf /tmp/protobuf-2.6.1.tar.gz* /tmp/protobuf-2.6.1
+    wget https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz
+    tar -xzvf protobuf-2.6.1.tar.gz --owner $USER --group $USER --no-same-owner 
+    cd protobuf-2.6.1/
     ./configure
     echo "Compiling protobuf"
     make -j`nproc`
@@ -222,9 +200,6 @@ install_protobuf_c_from_source(){
     protobuf_c_install_log=$OPENAIR_DIR/cmake_targets/log/protobuf_c_install_log.txt
     echo_info "\nInstalling Google Protobuf_C from sources. The log file for Protobuf_C installation is here: $protobuf_c_install_log "
     (
-    if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then
-        export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
-    fi
     cd /tmp
     echo "Downloading protobuf-c"
     rm -rf /tmp/protobuf-c
@@ -239,29 +214,7 @@ install_protobuf_c_from_source(){
     ) >& $protobuf_c_install_log
 }
 
-install_usrp_uhd_driver_from_source(){
-    uhd_install_log=$OPENAIR_DIR/cmake_targets/log/uhd_install_log.txt
-    echo_info "\nInstalling UHD driver from sources. The log file for UHD driver installation is here: $uhd_install_log "
-    (
-    cd /tmp
-    echo "Downloading UHD driver"
-    rm -rf /tmp/uhd
-    git clone git://github.com/EttusResearch/uhd.git
-    cd uhd
-    git checkout tags/release_003_010_001_001
-    mkdir -p host/build
-    cd host/build
-    $CMAKE ../
-    echo "Compiling UHD"
-    make
-    make test
-    $SUDO make install
-    $SUDO ldconfig
-    ) >& $uhd_install_log
-}
-
 check_install_usrp_uhd_driver(){
-    if [[ "$OS_DISTRO" == "ubuntu" ]]; then
         #first we remove old installation
         $SUDO apt-get remove -y uhd || true
         $SUDO apt-get remove libuhd-dev libuhd003 uhd-host -y
@@ -272,72 +225,27 @@ check_install_usrp_uhd_driver(){
         $SUDO apt-get update
         $SUDO apt-get -y --allow-unauthenticated install  python python-tk libboost-all-dev libusb-1.0-0-dev
         $SUDO apt-get -y --allow-unauthenticated install libuhd-dev libuhd003 uhd-host
-    elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
-        $SUDO $INSTALLER -y install python boost libusb-devel libusbx-devel boost-devel python-mako python-docutils cmake
-        if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then
-            # until EPEL repo hasn't bumped UHD driver to >=3.10 in EPEL, build driver from source
-            $SUDO $INSTALLER -y remove uhd uhd-devel uhd-firmware
-            install_ursp_uhd_driver_from_source
-        else
-            $SUDO $INSTALLER -y install uhd uhd-devel uhd-firmware
-        fi
-    fi
 }
 
 install_usrp_uhd_driver() {
-    if [[ "$OS_DISTRO" == "ubuntu" ]]; then
         # We move uhd-host apart because it depends on linux kernel version
         # On newer kernels, it fails to install
         $SUDO apt-get -y install uhd-host
-    fi
-    if [ -z $1 ]; then
-      $SUDO uhd_images_downloader
-    else
-      $SUDO uhd_images_downloader -i $1
-    fi
-}
-
-install_bladerf_driver_from_source(){
-    bladerf_install_log=$OPENAIR_DIR/cmake_targets/log/bladerf_install_log.txt
-    echo_info "\nInstalling BladeRF driver from sources. The log file for BladeRF driver installation is here: $bladerf_install_log "
-    (
-    cd /tmp
-    echo "Downloading BladeRF driver"
-    rm -rf /tmp/bladeRF
-    git clone https://github.com/Nuand/bladeRF.git
-    cd bladeRF
-    git checkout tags/2016.06
-    mkdir -p build
-    cd build
-    $CMAKE ../
-    echo "Compiling BladeRF driver"
-    make
-    $SUDO make install
-    $SUDO ldconfig
-    echo "Downloading FPGA and firmware images"
-    cd /tmp/bladeRF
-    wget https://www.nuand.com/fx3/bladeRF_fw_latest.img
-    wget https://www.nuand.com/fpga/hostedx40-latest.rbf
-    sudo mkdir -p /usr/share/Nuand/bladeRF
-    sudo mv bladeRF_fw_latest.img /usr/share/Nuand/bladeRF/bladeRF_fw.img
-    sudo mv hostedx40-latest.rbf /usr/share/Nuand/bladeRF/hostedx40.rbf
-    ) >& $bladerf_install_log
+        if [ -z $1 ]; then
+          $SUDO uhd_images_downloader
+        else
+          $SUDO uhd_images_downloader -i $1
+        fi
 }
 
 check_install_bladerf_driver(){
-    if [[ "$OS_DISTRO" == "ubuntu" ]]; then
-        if [ "$(get_distribution_release)" == "ubuntu14.04" ] ; then
-            $SUDO add-apt-repository -y ppa:bladerf/bladerf
-            $SUDO apt-get update
-        fi
-        $SUDO apt-get install -y --allow-unauthenticated  bladerf libbladerf-dev
-        $SUDO apt-get install -y --allow-unauthenticated bladerf-firmware-fx3
-        $SUDO apt-get install -y --allow-unauthenticated bladerf-fpga-hostedx40	
-   elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
-        install_bladerf_driver_from_source
-   else
-        echo_error "BladeRF Installer for OAI does not support automatic build. Install BladeRF compiling sources manually from BladeRF website"
-   fi
+	if [ "$(get_distribution_release)" == "Ubuntu14.04" ] ; then
+		$SUDO add-apt-repository -y ppa:bladerf/bladerf
+		$SUDO apt-get update
+	fi
+	$SUDO apt-get install -y --allow-unauthenticated  bladerf libbladerf-dev
+	$SUDO apt-get install -y --allow-unauthenticated bladerf-firmware-fx3
+	$SUDO apt-get install -y --allow-unauthenticated bladerf-fpga-hostedx40	
 }
 
 flash_firmware_bladerf() {
@@ -360,9 +268,8 @@ check_install_lmssdr_driver(){
 }
 
 check_install_additional_tools (){
-  $SUDO $INSTALLER update -y
-  if [[ "$OS_DISTRO" == "ubuntu" ]]; then
-    PACKAGE_LIST="\
+    $SUDO apt-get update
+    $SUDO apt-get install -y \
 	check \
 	dialog \
 	dkms \
@@ -391,73 +298,13 @@ check_install_additional_tools (){
         bc \
         ntp \
         python-scipy \
-        python-matplotlib"
-  elif [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then
-    PACKAGE_LIST="\
-      check \
-      dialog \
-      dkms \
-      gawk \
-      boost-devel \
-      openvpn \
-      pkgconfig \
-      pexpect \
-      sshfs \
-      swig  \
-      wireshark \
-      unzip  \
-      valgrind  \
-      vconfig	  \
-      ctags \
-      ntpdate \
-      iperf3 \
-      wvdial \
-      numpy \
-      sshpass \
-      nscd \
-      python2-paramiko \
-      python-pyroute2 \
-      python-netifaces \
-      scipy \
-      python-matplotlib"
-  elif [[ "$OS_DISTRO" == "fedora" ]]; then
-    PACKAGE_LIST=" \
-      check \
-      dialog \
-      dkms \
-      gawk \
-      boost-devel \
-      openvpn \
-      pkgconfig \
-      python-pexpect \
-      sshfs \
-      swig  \
-      wireshark \
-      unzip  \
-      valgrind  \
-      vconfig	  \
-      ctags \
-      ntpdate \
-      iperf3 \
-      wvdial \
-      python-numpy \
-      sshpass \
-      nscd \
-      python2-paramiko \
-      python-pyroute2 \
-      python-netifaces \
-      python2-scipy \
-      python2-matplotlib"
-  fi
-    $SUDO $INSTALLER install -y $PACKAGE_LIST
-    
-    $SUDO rm -fr /opt/ssh
-    $SUDO GIT_SSL_NO_VERIFY=true git clone https://gitlab.eurecom.fr/oai/ssh.git /opt/ssh
+        python-matplotlib
 
-  #The packages below are already installed for Redhat distros (RHEL, CentOS, Fedora)
-  if [[ "$OS_DISTRO" == "ubuntu" ]]; then
     $SUDO pip install paramiko
     $SUDO pip install pyroute2 colorama
+    $SUDO rm -fr /opt/ssh
+    $SUDO GIT_SSL_NO_VERIFY=true git clone https://gitlab.eurecom.fr/oai/ssh.git /opt/ssh
+    
     log_netiface=$OPENAIR_DIR/cmake_targets/log/netiface_install_log.txt
     echo_info "Installing Netinterfaces package. The logfile for installation is in $log_netiface"
     (
@@ -468,7 +315,6 @@ check_install_additional_tools (){
     $SUDO python setup.py install
     cd -
     ) >& $log_netiface
-  fi
 }
 
 check_install_oai_software() {
@@ -477,17 +323,16 @@ check_install_oai_software() {
         echo_error "Your distribution $(get_distribution_release) is not supported by oai !"
         exit 1
     fi
-    $SUDO $INSTALLER update -y
-  if [[ "$OS_DISTRO" == "ubuntu" ]]; then
+    $SUDO apt-get update
     $SUDO apt install -y software-properties-common
     case "$(get_distribution_release)" in
-        "ubuntu14.04")
+        "Ubuntu14.04")
             specific_packages="libtasn1-3-dev"
             # For iperf3
             $SUDO add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty-backports universe"
             $SUDO apt-get update
             ;;
-        "ubuntu16.04")
+        "Ubuntu16.04")
             specific_packages="libtasn1-6-dev"
             ;;
     esac
@@ -550,97 +395,73 @@ check_install_oai_software() {
 	python-pip \
 	pydb \
 	libyaml-dev \
-	wget \
-	libxpm-dev
+	wget
 
     $SUDO update-alternatives --set liblapack.so /usr/lib/atlas-base/atlas/liblapack.so
     
+    #Remove old gnutls/nettle installation that was done from sources
+    remove_nettle_from_source
+    
     $SUDO apt-get install -y nettle-dev nettle-bin
+    remove_gnutls_from_source
 
     $SUDO apt-get install -y libgnutls-dev
-  elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
-    if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then
-      if rpm -q epel-release > /dev/null; then
-        echo "EPEL repos already present. Good."
-      else
-        echo "EPEL repos not present. Installing them."
-        $SUDO $INSTALLER install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-      fi
-      $SUDO $INSTALLER install -y python-epdb
-      $SUDO $INSTALLER install -y gccxml
-    else
-      $SUDO $INSTALLER install -y mscgen pydb
-      # Fedora repos already contain gccxml's successor castxml.
-      $SUDO $INSTALLER install -y castxml
-    fi
     
-    $SUDO $INSTALLER install -y \
-      autoconf \
-      automake \
-      bc \
-      bison \
-      $CMAKE \
-      doxygen \
-      ethtool \
-      flex \
-      gdb \
-      git \
-      graphviz \
-      gtkwave \
-      guile-devel \
-      iperf \
-      iproute \
-      iptables \
-      iptables-devel \
-      atlas-devel \
-      blas-devel \
-      libconfig-devel \
-      libffi-devel \
-      xforms \
-      xforms-devel \
-      libgcrypt-devel \
-      gmp-devel \
-      gtk3-devel \
-      libidn2-devel  \
-      libidn-devel \
-      mariadb-devel \
-      octave-devel \
-      openpgm-devel \
-      lksctp-tools \
-      lksctp-tools-devel \
-      openssl-devel \
-      libtasn1 \
-      libtool \
-      libusb-devel \
-      libxml2 \
-      libxml2-devel \
-      libxslt-devel \
-      octave \
-      octave-signal \
-      openssh-clients \
-      openssh-server \
-      openssl \
-      patch \
-      psmisc \
-      python \
-      subversion \
-      xmlstarlet \
-      python-pip \
-      wget \
-      kernel-headers \
-      kernel-devel \
-      nettle-devel \
-      gnutls-devel \
-      libXpm-devel \
-      lapack \
-      lapack-devel \
-      blas \
-      blas-devel
-  fi
-
     install_asn1c_from_source
     $SUDO rm -fr /opt/ssh
     $SUDO git clone https://gist.github.com/2190472.git /opt/ssh
+    install_protobuf_from_source
+    install_protobuf_c_from_source
+}
+
+### Remove Nettle installation which was done from sources
+remove_nettle_from_source() {
+    nettle_uninstall_log=$OPENAIR_DIR/cmake_targets/log/nettle_uninstall_log.txt
+    echo_info "\nUn-Installing Nettle from sources. The log file for nettle un-installation is here: $nettle_uninstall_log "
+    (
+    $SUDO apt-get remove -y nettle-dev nettle-bin 
+    cd /tmp
+    echo "Downloading nettle archive"
+    $SUDO rm -rf /tmp/nettle-2.5.tar.gz* /tmp/nettle-2.5
+    wget https://ftp.gnu.org/gnu/nettle/nettle-2.5.tar.gz
+    if [ $? -ne 0 ]; then
+      wget ftp://ftp.lysator.liu.se/pub/security/lsh/nettle-2.5.tar.gz
+    fi
+    if [ ! -f nettle-2.5.tar.gz ]; then
+      echo_error "Could not download nettle source files"
+      cd -
+      return
+    fi
+    tar -xzf nettle-2.5.tar.gz
+    cd nettle-2.5/
+    ./configure --disable-openssl --enable-shared --prefix=/usr 
+    $SUDO make uninstall || true 
+    $SUDO ldconfig
+    ) >& $nettle_uninstall_log
+}
+
+### Remove Gnutls from source
+remove_gnutls_from_source(){
+    gnutls_uninstall_log=$OPENAIR_DIR/cmake_targets/log/gnutls_uninstall_log.txt
+    echo_info "\nUn-Installing Gnutls. The log file for Gnutls un-installation is here: $gnutls_uninstall_log "
+    (
+    $SUDO apt-get remove -y libgnutls-dev
+    cd /tmp 
+    echo "Downloading gnutls archive"
+    $SUDO rm -rf /tmp/gnutls-3.1.23.tar.xz* /tmp/gnutls-3.1.23
+    wget http://mirrors.dotsrc.org/gcrypt/gnutls/v3.1/gnutls-3.1.23.tar.xz || \
+      wget ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/gnutls-3.1.23.tar.xz
+    if [ ! -f gnutls-3.1.23.tar.xz ]; then
+      echo_error "Could not download gnutls source files"
+      cd -
+      return
+    fi
+    tar -xJf gnutls-3.1.23.tar.xz
+    cd gnutls-3.1.23/
+    ./configure --prefix=/usr
+    $SUDO make uninstall || true
+    $SUDO ldconfig
+    )>& $gnutls_uninstall_log
 }
 
 install_asn1c_from_source(){

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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" 4df485c5ddf2540eca271876cdc512caa19b0890 "fix_asn1.data/RRC.rel14/SystemInformation-r8-IEs.h.diff"
+  "SystemInformation-r8-IEs.h" 562e3c3aeb7c6d76d722f31bf24488a26e627f33 "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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

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.1  (the "License"); you may not use this file
+# * 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
 # *

common/config/config_cmdline.c

@@ -1,166 +0,0 @@
-/*
- * 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

@@ -1,227 +0,0 @@
-/*
- * 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

@@ -1,104 +0,0 @@
-/*
- * 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

@@ -1,120 +0,0 @@
-/*
- * 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

@@ -1,157 +0,0 @@
-/*
- * 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

@@ -1,65 +0,0 @@
-/*
- * 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

@@ -1,379 +0,0 @@
-#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

@@ -1,54 +0,0 @@
-/*
- * 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

@@ -1,39 +0,0 @@
-/*
- * 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

@@ -1,86 +0,0 @@
-/*
- * 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,9 +10,4 @@ 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("T tracer: got mess %d\n", t);
+printf("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 178
+#define VCD_NUM_FUNCTIONS 142
 
 /* number of VCD variables (to be kept up to date! see in T_messages.txt) */
-#define VCD_NUM_VARIABLES 128
+#define VCD_NUM_VARIABLES 107
 
 /* 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,67 +16,63 @@ 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,rnti : int,dci_format : int,harq_pid : int,mcs : int,TBS
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : 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,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : 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,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : 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,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,UE_id : 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,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : 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,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : 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,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : 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
     FORMAT = int,eNB_ID : int,frame : int,subframe : int,antenna : buffer,rxdata
-ID = ENB_PHY_OUTPUT_SIGNAL
-    DESC = eNodeB sent signal in the time domain for a duration of 1ms
-    GROUP = ALL:PHY:HEAVY:ENB
-    FORMAT = int,eNB_ID : int,CC_id : int,frame : int,subframe : int,antenna : buffer,txdata
 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,rnti : int,frame : int,subframe : int,antenna : buffer,chest_t
+    FORMAT = int,eNB_ID : int,UE_ID : 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,rnti : int,frame : int,subframe : int,nb_rb : int,N_RB_UL : int,symbols_per_tti : buffer,pusch_comp
+    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
 ID = ENB_PHY_PUCCH_1AB_IQ
     DESC = eNodeB PUCCH received IQ data
     GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
-    FORMAT = int,eNB_ID : int,rnti : int,frame : int,subframe : int,I : int,Q
+    FORMAT = int,eNB_ID : int,UE_ID : 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,rnti : int,frame : int,subframe : int,energy : int,threshold
+    FORMAT = int,eNB_ID : int,UE_ID : 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,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,UE_id : 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,rnti : int,first_transmission : int,Msg3_frame : int,Msg3_subframe
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : 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,preamble : int,energy : int,delay
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,preamble : int,energy : int,delay
 
 #MAC logs
 ID = ENB_MAC_UE_DL_SDU
@@ -115,10 +111,6 @@ ID = ENB_MAC_UE_DL_PDU_WITH_DATA
     DESC = MAC downlink PDU for an UE
     GROUP = ALL:MAC:ENB
     FORMAT = int,eNB_ID : int,CC_id : int,rnti : int,frame : int,subframe : int,harq_pid : buffer,data
-ID = ENB_MAC_SCHEDULING_REQUEST
-    DESC = MAC scheduling request detected for an UE
-    GROUP = ALL:MAC:ENB
-    FORMAT = int,eNB_ID : int,CC_id : int,frame : int,subframe : int,rnti
 
 #RLC logs
 ID = ENB_RLC_DL
@@ -834,27 +826,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,rnti : int,dci_format : int,harq_pid : int,mcs : int,TBS
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : 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,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : 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,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : 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,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,UE_id : 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,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : 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,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : 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 +854,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,frame : int,subframe : int,antenna : buffer,chest_t
+    FORMAT = int,eNB_ID : int,UE_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 +862,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,frame : int,subframe : int,pdcch_ch_level00 : int,pdcch_ch_level01 : int,pdcch_ch_level10: int,pdcch_ch_level11
+    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
 ID = UE_PHY_PDSCH_IQ
     DESC = UE PDSCH received IQ data
     GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,nb_rb : int,N_RB_UL : int,symbols_per_tti : buffer,pusch_comp
+    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
 ID = UE_PHY_PDSCH_ENERGY
     DESC = UE PDSCH 1 energy and threshold
     GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,eNB_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,UE_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,frame : int,subframe : int,p0_pusch : int,ampl: int,g_pusch: int,pl: int,nb_rb
+    FORMAT = int,eNB_ID : int,UE_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,frame : int,subframe : int,p0_pucch : int,ampl: int,g_pucch: int,pl
+    FORMAT = int,eNB_ID : int,UE_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,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,UE_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,38 +950,6 @@ 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
@@ -1082,14 +1042,6 @@ 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
@@ -1398,22 +1350,6 @@ ID = VCD_VARIABLE_UE0_SFN7
     DESC = VCD variable UE0_SFN7
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
-ID = VCD_VARIABLE_SEND_IF4_SYMBOL
-    DESC = VCD variable SEND_IF4_SYMBOL
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-ID = VCD_VARIABLE_RECV_IF4_SYMBOL
-    DESC = VCD variable RECV_IF4_SYMBOL
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-ID = VCD_VARIABLE_SEND_IF5_PKT_ID
-    DESC = VCD variable SEND_IF5_PKT_ID
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-ID = VCD_VARIABLE_RECV_IF5_PKT_ID
-    DESC = VCD variable RECV_IF5_PKT_ID
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
 ID = VCD_VARIABLE_UE_PDCP_FLUSH_SIZE
     DESC = VCD variable UE_PDCP_FLUSH_SIZE
     GROUP = ALL:VCD:ENB:UE:VCD_VARIABLE
@@ -1453,14 +1389,6 @@ 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
@@ -1613,28 +1541,12 @@ 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_RU_FEPRX
-    DESC = VCD function PHY_PROCEDURES_RU_FEPRX
+ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX_COMMON
+    DESC = VCD function PHY_PROCEDURES_ENB_RX_COMMON
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
-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
+ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX_COMMON1
+    DESC = VCD function PHY_PROCEDURES_ENB_RX_COMMON1
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX_UESPEC
@@ -1645,6 +1557,10 @@ 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
@@ -1841,10 +1757,6 @@ 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
@@ -2149,11 +2061,3 @@ ID = VCD_FUNCTION_RECV_IF5
     DESC = VCD function RECV_IF5
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
-ID = VCD_FUNCTION_TRX_COMPR_IF
-    DESC = VCD function TRX_COMPR_IF
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_TRX_DECOMPR_IF
-    DESC = VCD function TRX_DECOMPR_IF
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value

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("T tracer: waiting for connection on %s:%d\n", addr, port);
+  printf("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("T tracer: connected\n");
+  printf("connected\n");
 
   return t;
 }
@@ -150,7 +150,7 @@ process:
   while (size) {
     int l = write(f->socket_remote, b, size);
     if (l <= 0) {
-      printf("T tracer: forward error\n");
+      printf("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("T tracer: waiting for remote tracer on port %d\n", port);
+  printf("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("T tracer: WARNING: memory usage is over %"PRIu64"MB\n",
+    printf("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,11 +3,9 @@ CFLAGS=-Wall -g -pthread -DT_TRACER -I.
 
 #CFLAGS += -O3 -ffast-math -fomit-frame-pointer
 
-LIBS=-lm
-XLIBS=-lX11 -lpng -lXft
+LIBS=-lX11 -lm -lpng -lXft
 
-all: record replay extract_config textlog enb ue vcd macpdu2wireshark \
-     extract_input_subframe extract_output_subframe to_vcd extract
+all: record replay extract_config textlog enb ue vcd macpdu2wireshark
 
 record: utils.o record.o database.o config.o
 	$(CC) $(CFLAGS) -o record $^ $(LIBS)
@@ -18,40 +16,25 @@ replay: utils.o replay.o
 extract_config: extract_config.o
 	$(CC) $(CFLAGS) -o extract_config $^ $(LIBS)
 
-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) $(XLIBS)
+	$(CC) $(CFLAGS) -o textlog $^ $(LIBS)
 
 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) $(XLIBS)
+	$(CC) $(CFLAGS) -o enb $^ $(LIBS)
 
 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) $(XLIBS)
+	$(CC) $(CFLAGS) -o ue $^ $(LIBS)
 
 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) $(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)
+	$(CC) $(CFLAGS) -o vcd $^ $(LIBS)
 
 macpdu2wireshark: macpdu2wireshark.o database.o utils.o handler.o event.o \
                   config.o
@@ -75,9 +58,8 @@ filter/filter.a:
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 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
+	rm -f *.o core tracer_remote textlog enb vcd record replay
+	rm -f extract_config macpdu2wireshark
 	cd gui && make clean
 	cd view && make clean
 	cd logger && make clean

common/utils/T/tracer/enb.c

@@ -17,44 +17,6 @@
 #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;
@@ -63,7 +25,6 @@ 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;
@@ -97,7 +58,6 @@ 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)
@@ -125,6 +85,27 @@ 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;
@@ -135,15 +116,11 @@ 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_evfun(database, ue_id_from_rnti, NULL,
-            filter_evarg(database, event, "rnti")),
-          filter_int(ue)),
+        filter_eq(filter_evarg(database, event, "UE_id"), filter_int(ue)),
         filter_eq(filter_evarg(database, event, "eNB_ID"), filter_int(0))));
 }
 
@@ -171,28 +148,23 @@ static void set_current_ue(gui *g, enb_data *e, int ue)
 
   logger_set_filter(e->e->pusch_iq_ue_logger,
       filter_eq(
-        filter_evfun(e->database, ue_id_from_rnti, NULL,
-          filter_evarg(e->database, "ENB_PHY_PUSCH_IQ", "rnti")),
+        filter_evarg(e->database, "ENB_PHY_PUSCH_IQ", "UE_ID"),
         filter_int(ue)));
   logger_set_filter(e->e->ul_estimate_ue_logger,
       filter_eq(
-        filter_evfun(e->database, ue_id_from_rnti, NULL,
-          filter_evarg(e->database, "ENB_PHY_UL_CHANNEL_ESTIMATE", "rnti")),
+        filter_evarg(e->database, "ENB_PHY_UL_CHANNEL_ESTIMATE", "UE_ID"),
         filter_int(ue)));
   logger_set_filter(e->e->pucch1_energy_ue_threshold_logger,
       filter_eq(
-        filter_evfun(e->database, ue_id_from_rnti, NULL,
-          filter_evarg(e->database, "ENB_PHY_PUCCH_1_ENERGY", "rnti")),
+        filter_evarg(e->database, "ENB_PHY_PUCCH_1_ENERGY", "UE_ID"),
         filter_int(ue)));
   logger_set_filter(e->e->pucch1_energy_ue_energy_logger,
       filter_eq(
-        filter_evfun(e->database, ue_id_from_rnti, NULL,
-          filter_evarg(e->database, "ENB_PHY_PUCCH_1_ENERGY", "rnti")),
+        filter_evarg(e->database, "ENB_PHY_PUCCH_1_ENERGY", "UE_ID"),
         filter_int(ue)));
   logger_set_filter(e->e->pucch_iq_ue_logger,
       filter_eq(
-        filter_evfun(e->database, ue_id_from_rnti, NULL,
-          filter_evarg(e->database, "ENB_PHY_PUCCH_1AB_IQ", "rnti")),
+        filter_evarg(e->database, "ENB_PHY_PUCCH_1AB_IQ", "UE_ID"),
         filter_int(ue)));
   for (i = 0; i < 8; i++) {
     logger_set_filter(e->e->dl_dci_logger[i],
@@ -213,13 +185,11 @@ static void set_current_ue(gui *g, enb_data *e, int ue)
   }
   logger_set_filter(e->e->dl_mcs_logger,
       filter_eq(
-        filter_evfun(e->database, ue_id_from_rnti, NULL,
-          filter_evarg(e->database, "ENB_PHY_DLSCH_UE_DCI", "rnti")),
+        filter_evarg(e->database, "ENB_PHY_DLSCH_UE_DCI", "UE_id"),
         filter_int(ue)));
   logger_set_filter(e->e->ul_mcs_logger,
       filter_eq(
-        filter_evfun(e->database, ue_id_from_rnti, NULL,
-          filter_evarg(e->database, "ENB_PHY_ULSCH_UE_DCI", "rnti")),
+        filter_evarg(e->database, "ENB_PHY_ULSCH_UE_DCI", "UE_id"),
         filter_int(ue)));
 }
 
@@ -231,15 +201,12 @@ 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;
@@ -281,12 +248,10 @@ 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);
@@ -299,14 +264,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 * ed->nb_rb/25, 20, 70);
+  xy_plot_set_range(g, input_signal_plot, 0, 7680*10, 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 * ed->nb_rb/25, 10,
+  input_signal_view = new_view_xy(7680*10, 10,
       g, input_signal_plot, new_color(g, "#0c0c72"), XY_LOOP_MODE);
   logger_add_view(input_signal_log, input_signal_view);
 
@@ -624,8 +589,7 @@ 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, ed->ue);
-  register_notifier(g, "click", e->current_ue_button, click, ed);
+  set_current_ue(g, ed, 0);
   register_notifier(g, "click", e->prev_ue_button, click, ed);
   register_notifier(g, "click", e->next_ue_button, click, ed);
 }
@@ -646,28 +610,6 @@ 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;
@@ -686,10 +628,6 @@ 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();
 
@@ -700,8 +638,6 @@ 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; }
@@ -717,11 +653,6 @@ 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);
@@ -740,7 +671,7 @@ int main(int n, char **v)
   g = gui_init();
   new_thread(gui_thread, g);
 
-  enb_data.ue = 3;
+  enb_data.ue = 0;
   enb_data.e = &eg;
   enb_data.database = database;
 

common/utils/T/tracer/extract.c

@@ -1,124 +0,0 @@
-#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

@@ -1,143 +0,0 @@
-#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>\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);
-}
-
-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;
-  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; }
-    if (subframe == -1) { subframe = atoi(v[i]); continue; }
-    usage();
-  }
-  if (file == NULL || frame == -1 || subframe == -1) usage();
-
-  if (database_filename == NULL) {
-    printf("ERROR: provide a database file (-d)\n");
-    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);
-
-  input_event_id = event_id_from_name(database, "ENB_PHY_INPUT_SIGNAL");
-  f = get_format(database, input_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], "rxdata")) {
-      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_INPUT_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); }
-
-  /* get wanted frame/subframe */
-  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;
-    if (verbose)
-      printf("input frame %d subframe %d size %d\n",
-             e.e[frame_arg].i, e.e[subframe_arg].i, e.e[buffer_arg].bsize);
-    if (!(frame == e.e[frame_arg].i && subframe == e.e[subframe_arg].i))
-      continue;
-#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 (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

@@ -1,158 +0,0 @@
-#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,8 +10,6 @@ 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);
@@ -54,11 +52,6 @@ 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                                */
 /****************************************************************************/
@@ -70,12 +63,6 @@ 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);
@@ -148,19 +135,6 @@ 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,8 +9,6 @@ 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

@@ -1,302 +0,0 @@
-#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.1  (the "License"); you may not use this file
+ * 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
  *

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.1  (the "License"); you may not use this file
+ * 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
  *

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.1  (the "License"); you may not use this file
+ * 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
  *
@@ -95,7 +95,7 @@ hash_table_t *hashtable_create(const hash_size_t sizeP, hash_size_t (*hashfuncP)
  * Cleanup
  * The hashtable_destroy() walks through the linked lists for each possible hash value, and releases the elements. It also releases the nodes array and the hash_table_t.
  */
-hashtable_rc_t hashtable_destroy(hash_table_t * hashtblP)
+hashtable_rc_t hashtable_destroy(hash_table_t * const hashtblP)
 {
     hash_size_t n;
     hash_node_t *node, *oldnode;
@@ -117,7 +117,6 @@ hashtable_rc_t hashtable_destroy(hash_table_t * hashtblP)
     }
     free(hashtblP->nodes);
     free(hashtblP);
-    hashtblP=NULL;
     return HASH_TABLE_OK;
 }
 //-------------------------------------------------------------------------------------------------------------------------------

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.1  (the "License"); you may not use this file
+ * 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
  *

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.1  (the "License"); you may not use this file
+ * 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
  *

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.1  (the "License"); you may not use this file
+ * 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
  *

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.1  (the "License"); you may not use this file
+ * 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
  *

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.1  (the "License"); you may not use this file
+ * 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
  *

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.1  (the "License"); you may not use this file
+ * 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
  *

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.1  (the "License"); you may not use this file
+ * 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
  *
@@ -63,9 +63,6 @@
 
 #include "signals.h"
 #include "timer.h"
-#ifdef UE_EXPANSION
-#include "log.h"
-#endif
 
 #ifdef RTAI
 # include <rtai.h>
@@ -209,7 +206,6 @@ 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);
@@ -458,22 +454,7 @@ int itti_send_msg_to_task(task_id_t destination_task_id, instance_t instance, Me
 
       /* Enqueue message in destination task queue */
       if (lfds611_queue_enqueue(itti_desc.tasks[destination_task_id].message_queue, new) == 0) {
-#ifdef UE_EXPANSION
-        LOG_I(UDP_, " Assertion Message %s(id:%d), number %lu with priority %d can not be sent from (%u:%s) to queue (%u:%s). discarding...\n",
-                      itti_desc.messages_info[message_id].name,
-                      message_id,
-                      message_number,
-                      priority,
-                      origin_task_id,
-                      itti_get_task_name(origin_task_id),
-                      destination_task_id,
-                      itti_get_task_name(destination_task_id));
-        int result = itti_free(origin_task_id, message);
-        AssertFatal( result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
-        return 0;
-#else
         AssertFatal(0, "Error: lfds611_queue_enqueue returns 0, queue is full, exiting\n");
-#endif
       }
 
 #if defined(OAI_EMU) || defined(RTAI)
@@ -641,26 +622,17 @@ 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 */
-#ifdef UE_EXPANSION
-        LOG_I(UDP_, "Assertion No message in queue for task %d while there are %d events and some for the messages queue!\n", task_id, epoll_ret);
-        /* Mark that the event has been processed */
-        itti_desc.threads[thread_id].events[i].events &= ~EPOLLIN;
-        return;
-#else
         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);
-#endif
       }
 
       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.1  (the "License"); you may not use this file
+ * 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
  *

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.1  (the "License"); you may not use this file
+ * 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
  *

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.1  (the "License"); you may not use this file
+ * 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
  *

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.1  (the "License"); you may not use this file
+ * 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
  *

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.1  (the "License"); you may not use this file
+ * 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
  *

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.1  (the "License"); you may not use this file
+ * 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
  *

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.1  (the "License"); you may not use this file
+ * 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
  *