sdr_addrs used, samples are shifted by 4 for iris

New version 0.6.1.

Mostly bugfixes.

Conflicts:
	cmake_targets/tools/build_helper

.gitlab-ci.yml

@@ -0,0 +1,17 @@
+job1:
+  script:
+    - date
+    - pwd
+    - echo $OAI_TEST_CASE_GROUP
+    - echo $MACHINELIST
+    - echo $MACHINELISTGENERIC
+    - echo $RESULT_DIR
+    - echo $NRUNS_LTE_SOFTMODEM
+    - source oaienv
+    - rm -rf cmake_targets/autotests/log
+    - mkdir cmake_targets/autotests/log
+    - cd cmake_targets/autotests/v2
+    - python main.py
+    - date
+  only:
+    - triggers

README.txt

@@ -9,36 +9,26 @@ Please see NOTICE.txt for third party software that is included in the sources.
 The OpenAirInterface (OAI) software is composed of the following parts: 
 
 openairinterface5g
-├── ci-scripts: Meta-scripts used by the OSA CI process. Contains also configuration files used day-to-day by CI.
-├── cmake_targets: Build utilities to compile (simulation, emulation and real-time platforms), and generated build files
-├── common : Some common OAI utilities, other tools can be found at openair2/UTILS
-├── doc : Contains an up-to-date feature set list
+├── cmake_targets: build utilities to compile (simulation, emulation and real-time platforms), and generated build files
+├── common : some common OAI utilities, other tools can be found at openair2/UTILS
 ├── LICENSE
-├── maketags : Script to generate emacs tags
-├── nfapi : Contains the NFAPI code. A local Readme file provides more details.
-├── openair1 : 3GPP LTE Rel-10/12 PHY layer + PHY RF simulation. A local Readme file provides more details.
-├── openair2 : 3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP implementation. 
-    ├── COMMON
-    ├── DOCS
-    ├── ENB_APP
+├── maketags : script to generate emacs tags
+├── openair1 : 3GPP LTE Rel-10 PHY layer + PHY RF simulation and a subset of Rel 12 Features.
+├── openair2 :3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP implementation. 
     ├── LAYER2/RLC/ with the following subdirectories: UM_v9.3.0, TM_v9.3.0, and AM_v9.3.0. 
-    ├── LAYER2/PDCP/PDCP_v10.1.0.
-    ├── NETWORK_DRIVER
-    ├── PHY_INTERFACE
+    ├── LAYER2/PDCP/PDCP_v10.1.0. 
     ├── RRC/LITE
-    ├── UTIL
+    ├── PHY_INTERFACE
     ├── X2AP
+    ├── ENB_APP 
 ├── openair3: 3GPP LTE Rel10 for S1AP, NAS GTPV1-U for both ENB and UE.
-    ├── COMMON
-    ├── DOCS
     ├── GTPV1-U
-    ├── NAS
+    ├── NAS 
     ├── S1AP
     ├── SCTP
     ├── SECU
     ├── UDP
-    ├── UTILS
-└── targets: Top-level wrappers for unitary simulation for PHY channels, system-level emulation (eNB-UE with and without S1), and realtime eNB and UE and RRH GW.
+└── targets: top level wrapper for unitary simulation for PHY channels, system-level emulation (eNB-UE with and without S1), and realtime eNB and UE and RRH GW.
 
 
 RELEASE NOTES:
@@ -54,10 +44,3 @@ 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.
-v1.0.0 -> January 2019. This version first implements the architectural split described in doc/oai_lte_enb_func_split_arch.png picture.
-            Only FAPI, nFAPI and IF4.5 interfaces are implemented.
-            Repository tree structure prepares future integrations of features such as LTE-M, nbIOT or 5G-NR.
-            Preliminary X2 support has been implemented.
-            S1-flex has been introduced.
-            New tools: config library, telnet server, ...
-            A lot of bugfixes and a proper automated Continuous Integration process validates contributions.

ci-scripts/Jenkinsfile-gitlab

@@ -31,7 +31,6 @@ def sendSocialMediaMessage(pipeChannel, pipeColor, pipeMessage) {
 }
 
 def doRedHatBuild = false
-def doFlexranCtrlTest = false
 
 pipeline {
     agent {
@@ -41,7 +40,7 @@ pipeline {
         disableConcurrentBuilds()
         timestamps()
         gitLabConnection('OAI GitLab')
-        gitlabBuilds(builds: ["Build eNb-USRP", "Build basic-sim", "Build phy-sim", "Build eNb-ethernet", "Build UE-ethernet", "Analysis with cppcheck", "Test phy-sim", "Test basic-sim", "Test L2-sim", "Test-FDD-Band7", "Test-TDD-Band40", "Test-IF4p5-FDD-Band7", "Test-IF4p5-TDD-Band40"])
+        gitlabBuilds(builds: ["Build eNb-USRP", "Build basic-sim", "Build phy-sim", "Build eNb-ethernet", "Build UE-ethernet", "Analysis with cppcheck", "Test phy-sim", "Test basic-sim", "Test-FDD-Band7", "Test-TDD-Band40", "Test-IF4p5-FDD-Band7", "Test-IF4p5-TDD-Band40"])
         ansiColor('xterm')
     }
 
@@ -70,12 +69,6 @@ pipeline {
                     } else {
                         doRedHatBuild = false
                     }
-                    if (params.FlexRanRtcGitLabRepository_Credentials != null) {
-                        doFlexranCtrlTest = true
-                    }
-                    if (fileExists("flexran")) {
-                        sh "rm -Rf flexran > /dev/null 2>&1"
-                    }
                 }
             }
         }
@@ -110,18 +103,6 @@ pipeline {
                         // For the moment, there is no fail criteria. Just a notification of number of files that do not follow
                         sh "./ci-scripts/checkCodingFormattingRules.sh"
                     }
-                    if (doFlexranCtrlTest) {
-                        sh "mkdir flexran"
-                        dir ('flexran') {
-                            withCredentials([
-                                [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.FlexRanRtcGitLabRepository_Credentials}", usernameVariable: 'git_username', passwordVariable: 'git_password']
-                                ]) {
-                                sh "git clone https://${git_username}:${git_password}@gitlab.eurecom.fr/flexran/flexran-rtc.git . > ../git_clone.log 2>&1"
-                            }
-                            sh "sed -i -e 's#add-apt-repository.*cleishm.*neo4j#add-apt-repository ppa:cleishm/neo4j -y#' -e 's#libneo4j-client-dev#libneo4j-client-dev -y#' tools/install_dependencies"
-                            sh "zip -r -qq flexran.zip ."
-                        }
-                    }
                 }
             }
             post {
@@ -166,14 +147,6 @@ pipeline {
             }
         }
 
-        stage ("Start VM -- L2-Sim") {
-            steps {
-                timeout (time: 5, unit: 'MINUTES') {
-                    sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant l2-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
-                }
-            }
-        }
-
         stage ("Start VM -- phy-sim") {
             steps {
                 timeout (time: 5, unit: 'MINUTES') {
@@ -223,7 +196,7 @@ pipeline {
                     steps {
                         gitlabCommitStatus(name: "Build eNb-ethernet") {
                             timeout (time: 20, unit: 'MINUTES') {
-                                sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant enb-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
+                                sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant enb-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
                             }
                         }
                     }
@@ -232,20 +205,11 @@ pipeline {
                     steps {
                         gitlabCommitStatus(name: "Build UE-ethernet") {
                             timeout (time: 20, unit: 'MINUTES') {
-                                sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant ue-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
+                                sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant ue-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
                             }
                         }
                     }
                 }
-                stage ("Build L2-Simulator-eNB") {
-                    steps {
-                        //gitlabCommitStatus(name: "Build UE-ethernet") {
-                            timeout (time: 20, unit: 'MINUTES') {
-                                sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant l2-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
-                            }
-                        //}
-                    }
-                }
                 stage ("Build physical simulators") {
                     steps {
                         gitlabCommitStatus(name: "Build phy-sim") {
@@ -324,31 +288,12 @@ pipeline {
                 stage ("Test basic simulator") {
                     steps {
                         gitlabCommitStatus(name: "Test basic-sim") {
-                            timeout (time: 30, unit: 'MINUTES') {
+                            timeout (time: 20, unit: 'MINUTES') {
                                 sh "./ci-scripts/oai-ci-vm-tool test --workspace $WORKSPACE --variant basic-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
                             }
                         }
                     }
                 }
-                stage ("Test L2 simulator") {
-                    steps {
-                        gitlabCommitStatus(name: "Test L2-sim") {
-                            timeout (time: 30, unit: 'MINUTES') {
-                                sh "./ci-scripts/oai-ci-vm-tool test --workspace $WORKSPACE --variant l2-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
-                            }
-                        }
-                    }
-                }
-                stage ("Build Flexran Controller") {
-                    when {
-                        expression {doFlexranCtrlTest}
-                    }
-                    steps {
-                        timeout (time: 20, unit: 'MINUTES') {
-                            sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant flexran-rtc --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
-                        }
-                    }
-                }
                 stage ("Test FDD - Band 7 - B210") {
                     steps {
                         script {
@@ -534,7 +479,7 @@ pipeline {
                 always {
                     script {
                         dir ('archives') {
-                            sh "if [ -d basic_sim/test ] || [ -d phy_sim/test ] || [ -d l2_sim/test ]; then zip -r -qq vm_tests_logs.zip */test ; fi"
+                            sh "if [ -d basic_sim/test ] || [ -d phy_sim/test ]; then zip -r -qq vm_tests_logs.zip */test ; fi"
                         }
                         if(fileExists('archives/vm_tests_logs.zip')) {
                             archiveArtifacts artifacts: 'archives/vm_tests_logs.zip'

ci-scripts/Jenkinsfile-tmp-ran

@@ -27,8 +27,6 @@ def pythonExecutor = params.pythonExecutor
 
 // Location of the test XML file to be run
 def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
 
 // Name of the test stage
 def testStageName = params.pipelineTestStageName
@@ -110,14 +108,8 @@ pipeline {
                     if (params.pythonTestXmlFile == null) {
                         // picking default
                         testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
-                        echo "Test XML file(default):   ${testXMLFile}"
-                        mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
                     } else {
-                        String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-                        for (xmlFile in myXmlTestSuite) {
-                            mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                            echo "Test XML file         :   ${xmlFile}"
-                        }
+                        echo "Test XML file         :   ${testXMLFile}"
                     }
                     // If not present picking a default Stage Name
                     if (params.pipelineTestStageName == null) {
@@ -202,23 +194,17 @@ pipeline {
             steps {
                 script {
                     dir ('ci-scripts') {
-                        echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
-                        withCredentials([
-                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
-                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
-                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
-                        ]) {
-                            sh "python3 main.py --mode=InitiateHtml --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
-                            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-                            for (xmlFile in myXmlTestSuite) {
-                                try {
-                                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
-                                } catch (Exception e) {
-                                    currentBuild.result = 'FAILURE'
-                                    buildStageStatus = false
-                                }
+                        try {
+                            echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
+                            withCredentials([
+                                [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
+                                [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
+                                [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
+                            ]) {
+                                sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${testXMLFile}"
                             }
-                            sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
+                        } catch (Exception e) {
+                            currentBuild.result = 'FAILURE'
                         }
                     }
                 }
@@ -350,7 +336,7 @@ pipeline {
                             }
                             if(fileExists("ci-scripts/test_results.html")) {
                                 sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html"
-                                sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
+                                sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' test_results-${JOB_NAME}.html"
                                 archiveArtifacts "test_results-${JOB_NAME}.html"
                             }
                         }

ci-scripts/active_net_interfaces.awk

@@ -1,21 +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.1  (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
-# */
-/inet.*brd/{print "interfaceToUse="$NF"done"}

ci-scripts/buildOnRH.sh

@@ -198,18 +198,12 @@ do
     fi
 done
 
-if [ $NB_PATTERN_FILES -ne $NB_FOUND_FILES ]
-then
-    echo "Expecting $NB_PATTERN_FILES log files and found $NB_FOUND_FILES"
-    STATUS=-1
-fi
+if [ $NB_PATTERN_FILES -ne $NB_FOUND_FILES ]; then STATUS=-1; fi
 
 if [ $STATUS -eq 0 ]
 then
-    echo "BUILD_OK" > $ARCHIVES_LOC/build_final_status.log
     echo "STATUS seems OK"
 else
-    echo "BUILD_KO" > $ARCHIVES_LOC/build_final_status.log
     echo "STATUS failed?"
 fi
 exit $STATUS

ci-scripts/buildOnVM.sh

@@ -106,12 +106,7 @@ function build_on_vm {
     echo "############################################################"
     echo "Copying GIT repo into VM ($VM_NAME)" 
     echo "############################################################"
-    if [[ "$VM_NAME" == *"-flexran-rtc"* ]]
-    then
-        scp -o StrictHostKeyChecking=no $JENKINS_WKSP/flexran/flexran.zip ubuntu@$VM_IP_ADDR:/home/ubuntu/localZip.zip
-    else
-        scp -o StrictHostKeyChecking=no $JENKINS_WKSP/localZip.zip ubuntu@$VM_IP_ADDR:/home/ubuntu
-    fi
+    scp -o StrictHostKeyChecking=no $JENKINS_WKSP/localZip.zip ubuntu@$VM_IP_ADDR:/home/ubuntu
     scp -o StrictHostKeyChecking=no /etc/apt/apt.conf.d/01proxy ubuntu@$VM_IP_ADDR:/home/ubuntu
 
     echo "############################################################"
@@ -131,22 +126,7 @@ function build_on_vm {
             echo "sudo apt-get update > zip-install.txt 2>&1" >> $VM_CMDS
             echo "sudo apt-get --yes install zip daemon cppcheck >> zip-install.txt 2>&1" >> $VM_CMDS
         fi
-    fi
-    if [[ "$VM_NAME" == *"-flexran-rtc"* ]]
-    then
-        if [ $DAEMON -eq 0 ]
-        then
-            echo "echo \"sudo apt-get --yes --quiet install zip curl jq \"" >> $VM_CMDS
-            echo "sudo apt-get update > zip-install.txt 2>&1" >> $VM_CMDS
-            echo "sudo apt-get --yes install zip curl jq >> zip-install.txt 2>&1" >> $VM_CMDS
-        else
-            echo "echo \"sudo apt-get --yes --quiet install zip daemon curl jq \"" >> $VM_CMDS
-            echo "sudo apt-get update > zip-install.txt 2>&1" >> $VM_CMDS
-            echo "sudo apt-get --yes install zip daemon curl jq >> zip-install.txt 2>&1" >> $VM_CMDS
-        fi
-    fi
-    if [[ "$VM_NAME" != *"-cppcheck"* ]] && [[ "$VM_NAME" != *"-flexran-rtc"* ]]
-    then
+    else
         if [ $DAEMON -eq 0 ]
         then
             echo "echo \"sudo apt-get --yes --quiet install zip subversion libboost-dev \"" >> $VM_CMDS
@@ -176,19 +156,7 @@ function build_on_vm {
             echo "chmod 775 ./my-vm-build.sh " >> $VM_CMDS
             echo "sudo -E daemon --inherit --unsafe --name=build_daemon --chdir=/home/ubuntu/tmp -O /home/ubuntu/tmp/cmake_targets/log/cppcheck_build.txt -E /home/ubuntu/tmp/cmake_targets/log/cppcheck.xml ./my-vm-build.sh" >> $VM_CMDS
         fi
-    fi
-    if [[ "$VM_NAME" == *"-flexran-rtc"* ]]
-    then
-        echo "mkdir -p cmake_targets/log" >> $VM_CMDS
-        echo "chmod 777 cmake_targets/log" >> $VM_CMDS
-        echo "cp /home/ubuntu/zip-install.txt cmake_targets/log" >> $VM_CMDS
-        echo "echo \"./tools/install_dependencies \"" >> $VM_CMDS
-        echo "./tools/install_dependencies > cmake_targets/log/install-build.txt 2>&1" >> $VM_CMDS
-        echo "echo \"$BUILD_OPTIONS \"" >> $VM_CMDS
-        echo "$BUILD_OPTIONS > cmake_targets/log/rt_controller.Rel14.txt 2>&1" >> $VM_CMDS
-    fi
-    if [[ "$VM_NAME" != *"-cppcheck"* ]] && [[ "$VM_NAME" != *"-flexran-rtc"* ]]
-    then
+    else
         echo "echo \"source oaienv\"" >> $VM_CMDS
         echo "source oaienv" >> $VM_CMDS
         echo "cd cmake_targets/" >> $VM_CMDS

ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf

@@ -197,8 +197,8 @@ MACRLCs = (
 	tr_s_preference = "local_L1";
 	tr_n_preference = "local_RRC";
 	phy_test_mode = 0;
-        puSch10xSnr     =  160;
-        puCch10xSnr     =  160;
+        puSch10xSnr     =  200;
+        puCch10xSnr     =  200;
         }  
 );
 
@@ -227,7 +227,7 @@ RUs = (
 THREAD_STRUCT = (
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
     #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
     worker_config      = "WORKER_ENABLE";
   }

ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf

@@ -197,8 +197,8 @@ MACRLCs = (
 	tr_s_preference = "local_L1";
 	tr_n_preference = "local_RRC";
 	phy_test_mode = 0;
-        puSch10xSnr     =  160;
-        puCch10xSnr     =  160;
+        puSch10xSnr     =  200;
+        puCch10xSnr     =  200;
         }  
 );
 
@@ -218,7 +218,7 @@ RUs = (
          att_rx         = 0;
          bands          = [7];
          max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 125;
+         max_rxgain                    = 115;
          eNB_instances  = [0];
 
     }
@@ -227,7 +227,7 @@ RUs = (
 THREAD_STRUCT = (
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
     #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
     worker_config      = "WORKER_ENABLE";
   }

ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf

@@ -197,8 +197,8 @@ MACRLCs = (
 	tr_s_preference = "local_L1";
 	tr_n_preference = "local_RRC";
 	phy_test_mode = 0;
-        puSch10xSnr     =  160;
-        puCch10xSnr     =  160;
+        puSch10xSnr     =  200;
+        puCch10xSnr     =  200;
         }  
 );
 
@@ -218,7 +218,7 @@ RUs = (
          att_rx         = 0;
          bands          = [7];
          max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 120;
+         max_rxgain                    = 115;
          eNB_instances  = [0];
 
     }
@@ -227,7 +227,7 @@ RUs = (
 THREAD_STRUCT = (
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
     #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
     worker_config      = "WORKER_ENABLE";
   }

ci-scripts/conf_files/lte-fdd-basic-sim.conf

@@ -237,8 +237,8 @@ THREAD_STRUCT = (
 NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "ens3";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_INTERFACE_NAME = "lo";
+    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

ci-scripts/conf_files/lte-tdd-basic-sim.conf

@@ -217,8 +217,8 @@ THREAD_STRUCT = (
 NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "ens3";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_INTERFACE_NAME = "lo";
+    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf

@@ -200,8 +200,8 @@ MACRLCs = (
 	tr_s_preference = "local_L1";
 	tr_n_preference = "local_RRC";
 	phy_test_mode = 0;
-        puSch10xSnr     =  160;
-        puCch10xSnr     =  160;
+        puSch10xSnr     =  200;
+        puCch10xSnr     =  200;
         }  
 );
 
@@ -234,7 +234,7 @@ RUs = (
 THREAD_STRUCT = (
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
     #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
     worker_config      = "WORKER_ENABLE";
   }

ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf

@@ -200,8 +200,8 @@ MACRLCs = (
 	tr_s_preference = "local_L1";
 	tr_n_preference = "local_RRC";
 	phy_test_mode = 0;
-        puSch10xSnr     =  160;
-        puCch10xSnr     =  160;
+        puSch10xSnr     =  200;
+        puCch10xSnr     =  200;
         }  
 );
 
@@ -234,7 +234,7 @@ RUs = (
 THREAD_STRUCT = (
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
     #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
     worker_config      = "WORKER_ENABLE";
   }

ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf

@@ -200,8 +200,8 @@ MACRLCs = (
 	tr_s_preference = "local_L1";
 	tr_n_preference = "local_RRC";
 	phy_test_mode = 0;
-        puSch10xSnr     =  160;
-        puCch10xSnr     =  160;
+        puSch10xSnr     =  200;
+        puCch10xSnr     =  200;
         }  
 );
 
@@ -234,7 +234,7 @@ RUs = (
 THREAD_STRUCT = (
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
     #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
     worker_config      = "WORKER_ENABLE";
   }

ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf

@@ -1,236 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe00;
-
-    cell_type =  "CELL_MACRO_ENB";
-
-    eNB_name  =  "eNB-Eurecom-LTEBox";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-
-    plmn_list = ( { mcc = 208; mnc = 93; mnc_length = 2; } );
-
-    tr_s_preference     = "local_mac"
-
-    ////////// Physical parameters:
-
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type					      = "FDD";
-      tdd_config 					      = 3;
-      tdd_config_s            			      = 0;
-      prefix_type             			      = "NORMAL";
-      eutra_band              			      = 7;
-      downlink_frequency      			      = 2685000000L;
-      uplink_frequency_offset 			      = -120000000;
-      Nid_cell					      = 0;
-      N_RB_DL                 			      = 50;
-      Nid_cell_mbsfn          			      = 0;
-      nb_antenna_ports                                = 1;
-      nb_antennas_tx          			      = 1;
-      nb_antennas_rx          			      = 1;
-      tx_gain                                            = 90;
-      rx_gain                                            = 125;
-      pbch_repetition                                 = "FALSE";
-      prach_root              			      = 0;
-      prach_config_index      			      = 0;
-      prach_high_speed        			      = "DISABLE";
-      prach_zero_correlation  			      = 1;
-      prach_freq_offset       			      = 2;
-      pucch_delta_shift       			      = 1;
-      pucch_nRB_CQI           			      = 0;
-      pucch_nCS_AN            			      = 0;
-      pucch_n1_AN             			      = 0;
-      pdsch_referenceSignalPower 			      = -27;
-      pdsch_p_b                  			      = 0;
-      pusch_n_SB                 			      = 1;
-      pusch_enable64QAM          			      = "DISABLE";
-      pusch_hoppingMode                                  = "interSubFrame";
-      pusch_hoppingOffset                                = 0;
-      pusch_groupHoppingEnabled  			      = "ENABLE";
-      pusch_groupAssignment      			      = 0;
-      pusch_sequenceHoppingEnabled		   	      = "DISABLE";
-      pusch_nDMRS1                                       = 1;
-      phich_duration                                     = "NORMAL";
-      phich_resource                                     = "ONESIXTH";
-      srs_enable                                         = "DISABLE";
-      /*  srs_BandwidthConfig                                =;
-      srs_SubframeConfig                                 =;
-      srs_ackNackST                                      =;
-      srs_MaxUpPts                                       =;*/
-
-      pusch_p0_Nominal                                   = -96;
-      pusch_alpha                                        = "AL1";
-      pucch_p0_Nominal                                   = -104;
-      msg3_delta_Preamble                                = 6;
-      pucch_deltaF_Format1                               = "deltaF2";
-      pucch_deltaF_Format1b                              = "deltaF3";
-      pucch_deltaF_Format2                               = "deltaF0";
-      pucch_deltaF_Format2a                              = "deltaF0";
-      pucch_deltaF_Format2b		    	      = "deltaF0";
-
-      rach_numberOfRA_Preambles                          = 64;
-      rach_preamblesGroupAConfig                         = "DISABLE";
-      /*
-      rach_sizeOfRA_PreamblesGroupA                      = ;
-      rach_messageSizeGroupA                             = ;
-      rach_messagePowerOffsetGroupB                      = ;
-      */
-      rach_powerRampingStep                              = 4;
-      rach_preambleInitialReceivedTargetPower            = -108;
-      rach_preambleTransMax                              = 10;
-      rach_raResponseWindowSize                          = 10;
-      rach_macContentionResolutionTimer                  = 48;
-      rach_maxHARQ_Msg3Tx                                = 4;
-
-      pcch_default_PagingCycle                           = 128;
-      pcch_nB                                            = "oneT";
-      bcch_modificationPeriodCoeff			      = 2;
-      ue_TimersAndConstants_t300			      = 1000;
-      ue_TimersAndConstants_t301			      = 1000;
-      ue_TimersAndConstants_t310			      = 1000;
-      ue_TimersAndConstants_t311			      = 10000;
-      ue_TimersAndConstants_n310			      = 20;
-      ue_TimersAndConstants_n311			      = 1;
-      ue_TransmissionMode                                    = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal";
-      rxPool_sc_Period                                       = "sf40";
-      rxPool_data_CP_Len                                     = "normal";
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf              = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size             = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused      = 0;
-/*    rxPool_dataHoppingConfig_hoppingParameter                       = 0;
-      rxPool_dataHoppingConfig_numSubbands                            = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                               = 0;
-      rxPool_commTxResourceUC-ReqAllowed                              = "TRUE";
-*/
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      }
-    );
-
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    NETWORK_INTERFACES :
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "ens3";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "ens3";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-        
-    };
-  }
-);
-
-MACRLCs = (
-	{
-	num_cc = 1;
-      	local_s_if_name  = "lo:";			  
-      	remote_s_address = "127.0.0.1";
-    	local_s_address  = "127.0.0.2"; 
-    	local_s_portc    = 50001;	
-    	remote_s_portc   = 50000;
-    	local_s_portd    = 50011;	
-    	remote_s_portd   = 50010;
-	tr_s_preference = "nfapi";
-	tr_n_preference = "local_RRC";
-        }  
-);
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-log_config =
-    {
-      global_log_level                      ="info";
-      global_log_verbosity                  ="medium";
-      hw_log_level                          ="info";
-      hw_log_verbosity                      ="medium";
-      phy_log_level                         ="info";
-      phy_log_verbosity                     ="medium";
-      mac_log_level                         ="info";
-      mac_log_verbosity                     ="high";
-      rlc_log_level                         ="info";
-      rlc_log_verbosity                     ="medium";
-      pdcp_log_level                        ="info";
-      pdcp_log_verbosity                    ="medium";
-      rrc_log_level                         ="info";
-      rrc_log_verbosity                     ="medium";
-   };

ci-scripts/conf_files/rru.fdd.band7.conf

@@ -20,7 +20,7 @@ RUs = (
 THREAD_STRUCT = (
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
     #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
     worker_config      = "WORKER_ENABLE";
   }

ci-scripts/conf_files/ue.nfapi.conf

@@ -1,44 +0,0 @@
-log_config = {
-  global_log_level                      ="info";
-  global_log_verbosity                  ="medium";
-  hw_log_level                          ="info";
-  hw_log_verbosity                      ="medium";
-  phy_log_level                         ="info";
-  phy_log_verbosity                     ="medium";
-  mac_log_level                         ="info";
-  mac_log_verbosity                     ="medium";
-  rlc_log_level                         ="info";
-  rlc_log_verbosity                     ="medium";
-  pdcp_log_level                        ="info";
-  pdcp_log_verbosity                    ="medium";
-  rrc_log_level                         ="info";
-  rrc_log_verbosity                     ="full";
-};
-
-
-L1s = (
-    	{
-	num_cc = 1;
-	tr_n_preference = "nfapi";
-    	local_n_if_name  = "lo";
-      	remote_n_address = "127.0.0.2";
-    	local_n_address  = "127.0.0.1";
-    	local_n_portc    = 50000;
-    	remote_n_portc   = 50001;
-    	local_n_portd    = 50010;
-    	remote_n_portd   = 50011;
-        }  
-);
-
-RUs = (
-    {		  
-       local_rf       = "yes"
-       nb_tx          = 1
-       nb_rx          = 1
-       att_tx         = 90
-       att_rx         = 0;
-       bands          = [7,38,42,43];
-       max_pdschReferenceSignalPower = -27;
-       max_rxgain                    = 125;
-    }		      
-);

ci-scripts/doGitLabMerge.sh

@@ -1,24 +1,4 @@
 #!/bin/bash
-#/*
-# * 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.1  (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
-# */
 
 function usage {
     echo "OAI GitLab merge request applying script"

ci-scripts/oai-ci-vm-tool

@@ -40,8 +40,6 @@ function variant_usage {
     echo "    --variant cppcheck     OR -v4"
     echo "    --variant enb-ethernet OR -v7"
     echo "    --variant ue-ethernet  OR -v8"
-    echo "    --variant l2-sim       OR -v9"
-    echo "    --variant flexran-rtc  OR -v10"
 }
 
 MY_DIR=$(dirname $(readlink -f $0))
@@ -286,27 +284,6 @@ case $key in
     NBARGS=$[$NBARGS+256]
     shift
     ;;
-    -v9)
-    VM_NAME=ci-l2-sim
-    VM_MEMORY=8192
-    VM_CPU=8
-    ARCHIVES_LOC=l2_sim
-    LOG_PATTERN=.Rel14.txt
-    NB_PATTERN_FILES=4
-    BUILD_OPTIONS="--eNB -t ETHERNET"
-    RUN_OPTIONS="complex"
-    NBARGS=$[$NBARGS+256]
-    shift
-    ;;
-    -v10)
-    VM_NAME=ci-flexran-rtc
-    ARCHIVES_LOC=flexran
-    LOG_PATTERN=.Rel14.txt
-    NB_PATTERN_FILES=1
-    BUILD_OPTIONS="cmake . && make -j2"
-    NBARGS=$[$NBARGS+256]
-    shift
-    ;;
     --variant)
     variant="$2"
     case $variant in
@@ -363,25 +340,6 @@ case $key in
         BUILD_OPTIONS="--UE -t ETHERNET --noS1"
         NBARGS=$[$NBARGS+256]
         ;;
-        l2-sim)
-        VM_NAME=ci-l2-sim
-        VM_MEMORY=8192
-        VM_CPU=8
-        ARCHIVES_LOC=l2_sim
-        LOG_PATTERN=.Rel14.txt
-        NB_PATTERN_FILES=4
-        BUILD_OPTIONS="--eNB -t ETHERNET"
-        RUN_OPTIONS="complex"
-        NBARGS=$[$NBARGS+256]
-        ;;
-        flexran-rtc)
-        VM_NAME=ci-flexran-rtc
-        ARCHIVES_LOC=flexran
-        LOG_PATTERN=.Rel14.txt
-        NB_PATTERN_FILES=1
-        BUILD_OPTIONS="cmake . && make -j2"
-        NBARGS=$[$NBARGS+256]
-        ;;
         *)
         echo ""
         echo "Syntax Error: Invalid Variant option -> $variant"

ci-scripts/reportBuildLocally.sh

@@ -141,23 +141,6 @@ function details_table {
 
 function summary_table_header {
     echo "   <h3>$1</h3>" >> ./build_results.html
-    if [ -f $2/build_final_status.log ]
-    then
-        if [ `grep -c BUILD_OK $2/build_final_status.log` -eq 1 ]
-        then
-            echo "   <div class=\"alert alert-success\">" >> ./build_results.html
-            echo "      <strong>BUILD was SUCCESSFUL <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./build_results.html
-            echo "   </div>" >> ./build_results.html
-        else
-            echo "   <div class=\"alert alert-danger\">" >> ./build_results.html
-            echo "      <strong>BUILD was a FAILURE! <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./build_results.html
-            echo "   </div>" >> ./build_results.html
-        fi
-    else
-        echo "   <div class=\"alert alert-danger\">" >> ./build_results.html
-        echo "      <strong>COULD NOT DETERMINE BUILD FINAL STATUS! <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./build_results.html
-        echo "   </div>" >> ./build_results.html
-    fi
     echo "   <table border = \"1\">" >> ./build_results.html
     echo "      <tr bgcolor = \"#33CCFF\" >" >> ./build_results.html
     echo "        <th>Element</th>" >> ./build_results.html
@@ -215,28 +198,7 @@ function summary_table_footer {
 }
 
 function sca_summary_table_header {
-    echo "   <h3>$2</h3>" >> ./build_results.html
-    NB_ERRORS=`egrep -c "severity=\"error\"" $1`
-    NB_WARNINGS=`egrep -c "severity=\"warning\"" $1`
-    if [ $NB_ERRORS -eq 0 ] && [ $NB_WARNINGS -eq 0 ]
-    then
-        echo "   <div class=\"alert alert-success\">" >> ./build_results.html
-        echo "      <strong>CPPCHECK found NO error and NO warning <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./build_results.html
-        echo "   </div>" >> ./build_results.html
-    else
-        if [ $NB_ERRORS -eq 0 ]
-        then
-            echo "   <div class=\"alert alert-warning\">" >> ./build_results.html
-            echo "      <strong>CPPCHECK found NO error and $NB_WARNINGS warnings <span class=\"glyphicon glyphicon-warning-sign\"></span></strong>" >> ./build_results.html
-            echo "   </div>" >> ./build_results.html
-        else
-            echo "   <div class=\"alert alert-danger\">" >> ./build_results.html
-            echo "      <strong>CPPCHECK found $NB_ERRORS errors and $NB_WARNINGS warnings <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./build_results.html
-            echo "   </div>" >> ./build_results.html
-        fi
-    fi
-    echo "   <button data-toggle=\"collapse\" data-target=\"#oai-cppcheck-details\">More details on CPPCHECK results</button>" >> ./build_results.html
-    echo "   <div id=\"oai-cppcheck-details\" class=\"collapse\">" >> ./build_results.html
+    echo "   <h3>$1</h3>" >> ./build_results.html
     echo "   <table border = \"1\">" >> ./build_results.html
     echo "      <tr bgcolor = \"#33CCFF\" >" >> ./build_results.html
     echo "        <th>Error / Warning Type</th>" >> ./build_results.html
@@ -301,7 +263,6 @@ function sca_summary_table_footer {
     echo "   </table>" >> ./build_results.html
     echo "   <p>Full details in zipped artifact (cppcheck/cppcheck.xml) </p>" >> ./build_results.html
     echo "   <p style=\"margin-left: 30px\">Graphical Interface tool : <strong><code>cppcheck-gui -l cppcheck/cppcheck.xml</code></strong></p>" >> ./build_results.html
-    echo "   </div>" >> ./build_results.html
 }
 
 function report_build {
@@ -310,21 +271,15 @@ function report_build {
     echo "############################################################"
 
     echo "JENKINS_WKSP        = $JENKINS_WKSP"
-    echo "GIT_URL             = $GIT_URL"
 
     cd ${JENKINS_WKSP}
     echo "<!DOCTYPE html>" > ./build_results.html
     echo "<html class=\"no-js\" lang=\"en-US\">" >> ./build_results.html
     echo "<head>" >> ./build_results.html
-    echo "  <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">" >> ./build_results.html
-    echo "  <link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css\">" >> ./build_results.html
-    echo "  <script src=\"https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js\"></script>" >> ./build_results.html
-    echo "  <script src=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js\"></script>" >> ./build_results.html
     echo "  <title>Build Results for $JOB_NAME job build #$BUILD_ID</title>" >> ./build_results.html
     echo "  <base href = \"http://www.openairinterface.org/\" />" >> ./build_results.html
     echo "</head>" >> ./build_results.html
-    echo "<body><div class=\"container\">" >> ./build_results.html
-    echo "  <br>" >> ./build_results.html
+    echo "<body>" >> ./build_results.html
     echo "  <table style=\"border-collapse: collapse; border: none;\">" >> ./build_results.html
     echo "    <tr style=\"border-collapse: collapse; border: none;\">" >> ./build_results.html
     echo "      <td style=\"border-collapse: collapse; border: none;\">" >> ./build_results.html
@@ -341,45 +296,45 @@ function report_build {
     echo "  <br>" >> ./build_results.html
     echo "   <table border = \"1\">" >> ./build_results.html
     echo "      <tr>" >> ./build_results.html
-    echo "        <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-time\"></span> Build Start Time (UTC)</td>" >> ./build_results.html
+    echo "        <td bgcolor = \"lightcyan\" >Build Start Time (UTC)</td>" >> ./build_results.html
     echo "        <td>TEMPLATE_BUILD_TIME</td>" >> ./build_results.html
     echo "      </tr>" >> ./build_results.html
     echo "      <tr>" >> ./build_results.html
-    echo "        <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-cloud-upload\"></span> GIT Repository</td>" >> ./build_results.html
-    echo "        <td><a href=\"$GIT_URL\">$GIT_URL</a></td>" >> ./build_results.html
+    echo "        <td bgcolor = \"lightcyan\" >GIT Repository</td>" >> ./build_results.html
+    echo "        <td>$GIT_URL</td>" >> ./build_results.html
     echo "      </tr>" >> ./build_results.html
     echo "      <tr>" >> ./build_results.html
-    echo "        <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-wrench\"></span> Job Trigger</td>" >> ./build_results.html
+    echo "        <td bgcolor = \"lightcyan\" >Job Trigger</td>" >> ./build_results.html
     if [ $PU_TRIG -eq 1 ]; then echo "        <td>Push Event</td>" >> ./build_results.html; fi
     if [ $MR_TRIG -eq 1 ]; then echo "        <td>Merge-Request</td>" >> ./build_results.html; fi
     echo "      </tr>" >> ./build_results.html
     if [ $PU_TRIG -eq 1 ]
     then
         echo "      <tr>" >> ./build_results.html
-        echo "        <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-tree-deciduous\"></span> Branch</td>" >> ./build_results.html
+        echo "        <td bgcolor = \"lightcyan\" >Branch</td>" >> ./build_results.html
         echo "        <td>$SOURCE_BRANCH</td>" >> ./build_results.html
         echo "      </tr>" >> ./build_results.html
         echo "      <tr>" >> ./build_results.html
-        echo "        <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-tag\"></span> Commit ID</td>" >> ./build_results.html
+        echo "        <td bgcolor = \"lightcyan\" >Commit ID</td>" >> ./build_results.html
         echo "        <td>$SOURCE_COMMIT_ID</td>" >> ./build_results.html
         echo "      </tr>" >> ./build_results.html
     fi
     if [ $MR_TRIG -eq 1 ]
     then
         echo "      <tr>" >> ./build_results.html
-        echo "        <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-log-out\"></span> Source Branch</td>" >> ./build_results.html
+        echo "        <td bgcolor = \"lightcyan\" >Source Branch</td>" >> ./build_results.html
         echo "        <td>$SOURCE_BRANCH</td>" >> ./build_results.html
         echo "      </tr>" >> ./build_results.html
         echo "      <tr>" >> ./build_results.html
-        echo "        <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-tag\"></span> Source Commit ID</td>" >> ./build_results.html
+        echo "        <td bgcolor = \"lightcyan\" >Source Commit ID</td>" >> ./build_results.html
         echo "        <td>$SOURCE_COMMIT_ID</td>" >> ./build_results.html
         echo "      </tr>" >> ./build_results.html
         echo "      <tr>" >> ./build_results.html
-        echo "        <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-log-in\"></span> Target Branch</td>" >> ./build_results.html
+        echo "        <td bgcolor = \"lightcyan\" >Target Branch</td>" >> ./build_results.html
         echo "        <td>$TARGET_BRANCH</td>" >> ./build_results.html
         echo "      </tr>" >> ./build_results.html
         echo "      <tr>" >> ./build_results.html
-        echo "        <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-tag\"></span> Target Commit ID</td>" >> ./build_results.html
+        echo "        <td bgcolor = \"lightcyan\" >Target Commit ID</td>" >> ./build_results.html
         echo "        <td>$TARGET_COMMIT_ID</td>" >> ./build_results.html
         echo "      </tr>" >> ./build_results.html
     fi
@@ -389,38 +344,33 @@ function report_build {
     if [ -f ./oai_rules_result.txt ]
     then
         echo "   <h3>OAI Coding / Formatting Guidelines Check</h3>" >> ./build_results.html
+        echo "   <table border = "1">" >> ./build_results.html
+        echo "      <tr>" >> ./build_results.html
+        echo "        <td bgcolor = \"lightcyan\" >Result:</td>" >> ./build_results.html
         NB_FILES=`cat ./oai_rules_result.txt`
         if [ $NB_FILES = "0" ]
         then 
-            echo "   <div class=\"alert alert-success\">" >> ./build_results.html
-            if [ $PU_TRIG -eq 1 ]; then echo "      <strong>All files in repository follow OAI rules. <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./build_results.html; fi
-            if [ $MR_TRIG -eq 1 ]; then echo "      <strong>All modified files in Merge-Request follow OAI rules. <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./build_results.html; fi
-            echo "   </div>" >> ./build_results.html
+            if [ $PU_TRIG -eq 1 ]; then echo "        <td bgcolor = \"green\">All files in repository follow OAI rules. </td>" >> ./build_results.html; fi
+            if [ $MR_TRIG -eq 1 ]; then echo "        <td bgcolor = \"green\">All modified files in Merge-Request follow OAI rules.</td>" >> ./build_results.html; fi
+            echo "      </tr>" >> ./build_results.html
+            echo "   </table>" >> ./build_results.html
         else
-            echo "   <div class=\"alert alert-warning\">" >> ./build_results.html
-            if [ $PU_TRIG -eq 1 ]; then echo "      <strong>$NB_FILES files in repository DO NOT follow OAI rules. <span class=\"glyphicon glyphicon-warning-sign\"></span></strong>" >> ./build_results.html; fi
-            if [ $MR_TRIG -eq 1 ]; then echo "      <strong>$NB_FILES modified files in Merge-Request DO NOT follow OAI rules. <span class=\"glyphicon glyphicon-warning-sign\"></span></strong>" >> ./build_results.html; fi
-            echo "   </div>" >> ./build_results.html
-        fi
-        if [ -f ./oai_rules_result_list.txt ]
-        then
-            echo "   <button data-toggle=\"collapse\" data-target=\"#oai-formatting-details\">More details on formatting check</button>" >> ./build_results.html
-            echo "   <div id=\"oai-formatting-details\" class=\"collapse\">" >> ./build_results.html
+            if [ $PU_TRIG -eq 1 ]; then echo "        <td bgcolor = \"orange\">$NB_FILES files in repository DO NOT follow OAI rules. </td>" >> ./build_results.html; fi
+            if [ $MR_TRIG -eq 1 ]; then echo "        <td bgcolor = \"orange\">$NB_FILES modified files in Merge-Request DO NOT follow OAI rules.</td>" >> ./build_results.html; fi
+            echo "      </tr>" >> ./build_results.html
+            if [ -f ./oai_rules_result_list.txt ]
+            then
+                awk '{print "      <tr><td></td><td>"$1"</td></tr>"}' ./oai_rules_result_list.txt >> ./build_results.html
+            fi
+            echo "   </table>" >> ./build_results.html
             echo "   <p>Please apply the following command to this(ese) file(s): </p>" >> ./build_results.html
             echo "   <p style=\"margin-left: 30px\"><strong><code>astyle --options=ci-scripts/astyle-options.txt filename(s)</code></strong></p>" >> ./build_results.html
-            echo "   <table border = 1>" >> ./build_results.html
-            echo "      <tr>" >> ./build_results.html
-            echo "        <th bgcolor = \"lightcyan\" >Filename</th>" >> ./build_results.html
-            echo "      </tr>" >> ./build_results.html
-            awk '{print "      <tr><td>"$1"</td></tr>"}' ./oai_rules_result_list.txt >> ./build_results.html
-            echo "   </table>" >> ./build_results.html
-            echo "   </div>" >> ./build_results.html
         fi
     fi
 
     echo "   <h2>Ubuntu 16.04 LTS -- Summary</h2>" >> ./build_results.html
 
-    sca_summary_table_header ./archives/cppcheck/cppcheck.xml "OAI Static Code Analysis with CPPCHECK"
+    sca_summary_table_header "OAI Static Code Analysis with CPPCHECK"
     sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Uninitialized variable" uninitvar
     sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Uninitialized struct member" uninitStructMember
     sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Memory leak" memleak
@@ -432,20 +382,20 @@ function report_build {
     sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Expression depends on order of evaluation of side effects" unknownEvaluationOrder
     sca_summary_table_footer ./archives/cppcheck/cppcheck.xml
 
-    summary_table_header "OAI Build eNB -- USRP option" ./archives/enb_usrp
+    summary_table_header "OAI Build eNB -- USRP option"
     summary_table_row "LTE SoftModem - Release 14" ./archives/enb_usrp/lte-softmodem.Rel14.txt "Built target lte-softmodem" ./enb_usrp_row1.html
     summary_table_row "Coding - Release 14" ./archives/enb_usrp/coding.Rel14.txt "Built target coding" ./enb_usrp_row2.html
     summary_table_row "OAI USRP device if - Release 14" ./archives/enb_usrp/oai_usrpdevif.Rel14.txt "Built target oai_usrpdevif" ./enb_usrp_row3.html
     summary_table_row "Parameters Lib Config - Release 14" ./archives/enb_usrp/params_libconfig.Rel14.txt "Built target params_libconfig" ./enb_usrp_row4.html
     summary_table_footer
 
-    summary_table_header "OAI Build basic simulator option" ./archives/basic_sim
+    summary_table_header "OAI Build basic simulator option"
     summary_table_row "Basic Simulator eNb - Release 14" ./archives/basic_sim/basic_simulator_enb.txt "Built target lte-softmodem" ./basic_sim_row1.html
     summary_table_row "Basic Simulator UE - Release 14" ./archives/basic_sim/basic_simulator_ue.txt "Built target lte-uesoftmodem" ./basic_sim_row2.html
     summary_table_row "Conf 2 UE data - Release 14" ./archives/basic_sim/conf2uedata.Rel14.txt "Built target conf2uedata" ./basic_sim_row3.html
     summary_table_footer
 
-    summary_table_header "OAI Build Physical simulators option" ./archives/phy_sim
+    summary_table_header "OAI Build Physical simulators option"
     summary_table_row "DL Simulator - Release 14" ./archives/phy_sim/dlsim.Rel14.txt "Built target dlsim" ./phy_sim_row1.html
     summary_table_row "UL Simulator - Release 14" ./archives/phy_sim/ulsim.Rel14.txt "Built target ulsim" ./phy_sim_row2.html
     summary_table_row "Coding - Release 14" ./archives/phy_sim/coding.Rel14.txt "Built target coding" ./phy_sim_row3.html
@@ -454,7 +404,7 @@ function report_build {
 
     if [ -f archives/gnb_usrp/nr-softmodem.Rel14.txt ]
     then
-        summary_table_header "OAI Build gNB -- USRP option" ./archives/gnb_usrp
+        summary_table_header "OAI Build gNB -- USRP option"
         summary_table_row "LTE SoftModem - Release 14" ./archives/gnb_usrp/nr-softmodem.Rel14.txt "Built target nr-softmodem" ./gnb_usrp_row1.html
         summary_table_row "Coding - Release 14" ./archives/gnb_usrp/coding.Rel14.txt "Built target coding" ./gnb_usrp_row2.html
         summary_table_row "OAI USRP device if - Release 14" ./archives/gnb_usrp/oai_usrpdevif.Rel14.txt "Built target oai_usrpdevif" ./gnb_usrp_row3.html
@@ -464,7 +414,7 @@ function report_build {
 
     if [ -f archives/nrue_usrp/nr-uesoftmodem.Rel14.txt ]
     then
-        summary_table_header "OAI Build 5G NR UE -- USRP option" ./archives/nrue_usrp
+        summary_table_header "OAI Build 5G NR UE -- USRP option"
         summary_table_row "UE SoftModem - Release 14" ./archives/nrue_usrp/nr-uesoftmodem.Rel14.txt "Built target nr-uesoftmodem" ./nrue_usrp_row1.html
         summary_table_row "Coding - Release 14" ./archives/nrue_usrp/coding.Rel14.txt "Built target coding" ./nrue_usrp_row2.html
         summary_table_row "OAI USRP device if - Release 14" ./archives/nrue_usrp/oai_usrpdevif.Rel14.txt "Built target oai_usrpdevif" ./nrue_usrp_row3.html
@@ -472,7 +422,7 @@ function report_build {
         summary_table_footer
     fi
 
-    summary_table_header "OAI Build eNB -- ETHERNET transport option" ./archives/enb_eth
+    summary_table_header "OAI Build eNB -- ETHERNET transport option"
     summary_table_row "LTE SoftModem w/o S1 - Release 14" ./archives/enb_eth/lte-softmodem-nos1.Rel14.txt "Built target lte-softmodem" ./enb_eth_row1.html
     summary_table_row "Coding - Release 14" ./archives/enb_eth/coding.Rel14.txt "Built target coding" ./enb_eth_row2.html
     summary_table_row "OAI ETHERNET transport - Release 14" ./archives/enb_eth/oai_eth_transpro.Rel14.txt "Built target oai_eth_transpro" ./enb_eth_row3.html
@@ -481,7 +431,7 @@ function report_build {
     summary_table_row "NAS Mesh - Release 14" ./archives/enb_eth/nasmesh.Rel14.txt "Built target nasmesh" ./enb_eth_row6.html
     summary_table_footer
 
-    summary_table_header "OAI Build UE -- ETHERNET transport option" ./archives/ue_eth
+    summary_table_header "OAI Build UE -- ETHERNET transport option"
     summary_table_row "LTE UE SoftModem w/o S1 - Release 14" ./archives/ue_eth/lte-uesoftmodem-nos1.Rel14.txt "Built target lte-uesoftmodem" ./ue_eth_row1.html
     summary_table_row "Coding - Release 14" ./archives/ue_eth/coding.Rel14.txt "Built target coding" ./ue_eth_row2.html
     summary_table_row "OAI ETHERNET transport - Release 14" ./archives/ue_eth/oai_eth_transpro.Rel14.txt "Built target oai_eth_transpro" ./ue_eth_row3.html
@@ -494,7 +444,7 @@ function report_build {
     then
         echo "   <h2>Red Hat (CentOS Linux release 7.4.1708) -- Summary</h2>" >> ./build_results.html
 
-        summary_table_header "Red Hat -- OAI Build eNB -- USRP option" ./archives/red_hat
+        summary_table_header "Red Hat -- OAI Build eNB -- USRP option"
         summary_table_row "LTE SoftModem - Release 14" ./archives/red_hat/lte-softmodem.Rel14.txt "Built target lte-softmodem" ./enb_usrp_rh_row1.html
         summary_table_row "Coding - Release 14" ./archives/red_hat/coding.Rel14.txt "Built target coding" ./enb_usrp_rh_row2.html
         summary_table_row "OAI USRP device if - Release 14" ./archives/red_hat/oai_usrpdevif.Rel14.txt "Built target oai_usrpdevif" ./enb_usrp_rh_row3.html
@@ -503,8 +453,6 @@ function report_build {
     fi
 
     echo "   <h3>Details</h3>" >> ./build_results.html
-    echo "   <button data-toggle=\"collapse\" data-target=\"#oai-compilation-details\">Details for Compilation Errors and Warnings </button>" >> ./build_results.html
-    echo "   <div id=\"oai-compilation-details\" class=\"collapse\">" >> ./build_results.html
 
     for DETAILS_TABLE in `ls ./enb_usrp_row*.html`
     do
@@ -544,9 +492,6 @@ function report_build {
     fi
     rm -f ./*_row*.html
 
-    echo "   </div>" >> ./build_results.html
-    echo "   <p></p>" >> ./build_results.html
-    echo "   <div class=\"well well-lg\">End of Build Report -- Copyright <span class=\"glyphicon glyphicon-copyright-mark\"></span> 2018 <a href=\"http://www.openairinterface.org/\">OpenAirInterface</a>. All Rights Reserved.</div>" >> ./build_results.html
-    echo "</div></body>" >> ./build_results.html
+    echo "</body>" >> ./build_results.html
     echo "</html>" >> ./build_results.html
 }

ci-scripts/reportTestLocally.sh

@@ -92,15 +92,10 @@ function report_test {
     echo "<!DOCTYPE html>" > ./test_simulator_results.html
     echo "<html class=\"no-js\" lang=\"en-US\">" >> ./test_simulator_results.html
     echo "<head>" >> ./test_simulator_results.html
-    echo "  <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">" >> ./test_simulator_results.html
-    echo "  <link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css\">" >> ./test_simulator_results.html
-    echo "  <script src=\"https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js\"></script>" >> ./test_simulator_results.html
-    echo "  <script src=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js\"></script>" >> ./test_simulator_results.html
     echo "  <title>Simulator Results for $JOB_NAME job build #$BUILD_ID</title>" >> ./test_simulator_results.html
     echo "  <base href = \"http://www.openairinterface.org/\" />" >> ./test_simulator_results.html
     echo "</head>" >> ./test_simulator_results.html
-    echo "<body><div class=\"container\">" >> ./test_simulator_results.html
-    echo "  <br>" >> ./test_simulator_results.html
+    echo "<body>" >> ./test_simulator_results.html
     echo "  <table style=\"border-collapse: collapse; border: none;\">" >> ./test_simulator_results.html
     echo "    <tr style=\"border-collapse: collapse; border: none;\">" >> ./test_simulator_results.html
     echo "      <td style=\"border-collapse: collapse; border: none;\">" >> ./test_simulator_results.html
@@ -117,45 +112,45 @@ function report_test {
     echo "  <br>" >> ./test_simulator_results.html
     echo "   <table border = \"1\">" >> ./test_simulator_results.html
     echo "      <tr>" >> ./test_simulator_results.html
-    echo "        <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-time\"></span> Build Start Time (UTC)</td>" >> ./test_simulator_results.html
+    echo "        <td bgcolor = \"lightcyan\" >Build Start Time (UTC)</td>" >> ./test_simulator_results.html
     echo "        <td>TEMPLATE_BUILD_TIME</td>" >> ./test_simulator_results.html
     echo "      </tr>" >> ./test_simulator_results.html
     echo "      <tr>" >> ./test_simulator_results.html
-    echo "        <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-cloud-upload\"></span> GIT Repository</td>" >> ./test_simulator_results.html
+    echo "        <td bgcolor = \"lightcyan\" >GIT Repository</td>" >> ./test_simulator_results.html
     echo "        <td><a href=\"$GIT_URL\">$GIT_URL</a></td>" >> ./test_simulator_results.html
     echo "      </tr>" >> ./test_simulator_results.html
     echo "      <tr>" >> ./test_simulator_results.html
-    echo "        <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-wrench\"></span> Job Trigger</td>" >> ./test_simulator_results.html
+    echo "        <td bgcolor = \"lightcyan\" >Job Trigger</td>" >> ./test_simulator_results.html
     if [ $PU_TRIG -eq 1 ]; then echo "        <td>Push Event</td>" >> ./test_simulator_results.html; fi
     if [ $MR_TRIG -eq 1 ]; then echo "        <td>Merge-Request</td>" >> ./test_simulator_results.html; fi
     echo "      </tr>" >> ./test_simulator_results.html
     if [ $PU_TRIG -eq 1 ]
     then
         echo "      <tr>" >> ./test_simulator_results.html
-        echo "        <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-tree-deciduous\"></span> Branch</td>" >> ./test_simulator_results.html
+        echo "        <td bgcolor = \"lightcyan\" >Branch</td>" >> ./test_simulator_results.html
         echo "        <td>$SOURCE_BRANCH</td>" >> ./test_simulator_results.html
         echo "      </tr>" >> ./test_simulator_results.html
         echo "      <tr>" >> ./test_simulator_results.html
-        echo "        <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-tag\"></span> Commit ID</td>" >> ./test_simulator_results.html
+        echo "        <td bgcolor = \"lightcyan\" >Commit ID</td>" >> ./test_simulator_results.html
         echo "        <td>$SOURCE_COMMIT_ID</td>" >> ./test_simulator_results.html
         echo "      </tr>" >> ./test_simulator_results.html
     fi
     if [ $MR_TRIG -eq 1 ]
     then
         echo "      <tr>" >> ./test_simulator_results.html
-        echo "        <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-log-out\"></span> Source Branch</td>" >> ./test_simulator_results.html
+        echo "        <td bgcolor = \"lightcyan\" >Source Branch</td>" >> ./test_simulator_results.html
         echo "        <td>$SOURCE_BRANCH</td>" >> ./test_simulator_results.html
         echo "      </tr>" >> ./test_simulator_results.html
         echo "      <tr>" >> ./test_simulator_results.html
-        echo "        <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-tag\"></span> Source Commit ID</td>" >> ./test_simulator_results.html
+        echo "        <td bgcolor = \"lightcyan\" >Source Commit ID</td>" >> ./test_simulator_results.html
         echo "        <td>$SOURCE_COMMIT_ID</td>" >> ./test_simulator_results.html
         echo "      </tr>" >> ./test_simulator_results.html
         echo "      <tr>" >> ./test_simulator_results.html
-        echo "        <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-log-in\"></span> Target Branch</td>" >> ./test_simulator_results.html
+        echo "        <td bgcolor = \"lightcyan\" >Target Branch</td>" >> ./test_simulator_results.html
         echo "        <td>$TARGET_BRANCH</td>" >> ./test_simulator_results.html
         echo "      </tr>" >> ./test_simulator_results.html
         echo "      <tr>" >> ./test_simulator_results.html
-        echo "        <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-tag\"></span> Target Commit ID</td>" >> ./test_simulator_results.html
+        echo "        <td bgcolor = \"lightcyan\" >Target Commit ID</td>" >> ./test_simulator_results.html
         echo "        <td>$TARGET_COMMIT_ID</td>" >> ./test_simulator_results.html
         echo "      </tr>" >> ./test_simulator_results.html
     fi
@@ -167,26 +162,6 @@ function report_test {
     then
         echo "   <h3>Basic Simulator Check</h3>" >> ./test_simulator_results.html
 
-        if [ -f $ARCHIVES_LOC/test_final_status.log ]
-        then
-            if [ `grep -c TEST_OK $ARCHIVES_LOC/test_final_status.log` -eq 1 ]
-            then
-                echo "   <div class=\"alert alert-success\">" >> ./test_simulator_results.html
-                echo "      <strong>TEST was SUCCESSFUL <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./test_simulator_results.html
-                echo "   </div>" >> ./test_simulator_results.html
-            else
-                echo "   <div class=\"alert alert-danger\">" >> ./test_simulator_results.html
-                echo "      <strong>TEST was a FAILURE! <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./test_simulator_results.html
-                echo "   </div>" >> ./test_simulator_results.html
-            fi
-        else
-            echo "   <div class=\"alert alert-danger\">" >> ./test_simulator_results.html
-            echo "      <strong>COULD NOT DETERMINE TEST FINAL STATUS! <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./test_simulator_results.html
-            echo "   </div>" >> ./test_simulator_results.html
-        fi
-
-        echo "   <button data-toggle=\"collapse\" data-target=\"#oai-basic-sim-test-details\">More details on Basic Simulator test results</button>" >> ./test_simulator_results.html
-        echo "   <div id=\"oai-basic-sim-test-details\" class=\"collapse\">" >> ./test_simulator_results.html
         echo "   <table border = \"1\">" >> ./test_simulator_results.html
         echo "      <tr bgcolor = \"#33CCFF\" >" >> ./test_simulator_results.html
         echo "        <th>Log File Name</th>" >> ./test_simulator_results.html
@@ -385,160 +360,6 @@ function report_test {
         done
 
         echo "   </table>" >> ./test_simulator_results.html
-        echo "   </div>" >> ./test_simulator_results.html
-    fi
-
-    if [ -e $JENKINS_WKSP/flexran/flexran_build_complete.txt ]
-    then
-        echo "   <h3>Basic Simulator + FlexRan Controller Check</h3>" >> ./test_simulator_results.html
-        echo "   <div class=\"alert alert-success\">" >> ./test_simulator_results.html
-        echo "      <strong>TEST was SUCCESSFUL <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./test_simulator_results.html
-        echo "   </div>" >> ./test_simulator_results.html
-        echo "   <button data-toggle=\"collapse\" data-target=\"#oai-flexran-test-details\">More details on Basic Simulator + Fleran Controller test results</button>" >> ./test_simulator_results.html
-        echo "   <div id=\"oai-flexran-test-details\" class=\"collapse\">" >> ./test_simulator_results.html
-        echo "   <table border = \"1\">" >> ./test_simulator_results.html
-        echo "      <tr bgcolor = \"#33CCFF\" >" >> ./test_simulator_results.html
-        echo "        <th>Log File Name</th>" >> ./test_simulator_results.html
-        echo "        <th>JSON Query Response</th>" >> ./test_simulator_results.html
-        echo "      </tr>" >> ./test_simulator_results.html
-
-        FLEXRAN_QUERIES=`ls $ARCHIVES_LOC/flexran_ctl_query_*log`
-        for QUERY in $FLEXRAN_QUERIES
-        do
-            echo "      <tr>" >> ./test_simulator_results.html
-            NAME=`echo $QUERY | sed -e "s#$ARCHIVES_LOC/##"`
-            echo "        <td>$NAME</td>" >> ./test_simulator_results.html
-            echo "        <td><pre><code>" >> ./test_simulator_results.html
-            egrep -v "LOG_NAME|\-\-\-\-\-" $QUERY >> ./test_simulator_results.html
-            echo "        </code></pre></td>" >> ./test_simulator_results.html
-            echo "      </tr>" >> ./test_simulator_results.html
-        done
-        echo "   </table>" >> ./test_simulator_results.html
-        echo "   </div>" >> ./test_simulator_results.html
-    fi
-
-    ARCHIVES_LOC=archives/l2_sim/test
-    if [ -d $ARCHIVES_LOC ]
-    then
-        echo "   <h3>L2-NFAPI Simulator Check</h3>" >> ./test_simulator_results.html
-
-        if [ -f $ARCHIVES_LOC/test_final_status.log ]
-        then
-            if [ `grep -c TEST_OK $ARCHIVES_LOC/test_final_status.log` -eq 1 ]
-            then
-                echo "   <div class=\"alert alert-success\">" >> ./test_simulator_results.html
-                echo "      <strong>TEST was SUCCESSFUL <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./test_simulator_results.html
-                echo "   </div>" >> ./test_simulator_results.html
-            else
-                echo "   <div class=\"alert alert-danger\">" >> ./test_simulator_results.html
-                echo "      <strong>TEST was a FAILURE! <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./test_simulator_results.html
-                echo "   </div>" >> ./test_simulator_results.html
-            fi
-        else
-            echo "   <div class=\"alert alert-danger\">" >> ./test_simulator_results.html
-            echo "      <strong>COULD NOT DETERMINE TEST FINAL STATUS! <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./test_simulator_results.html
-            echo "   </div>" >> ./test_simulator_results.html
-        fi
-
-        echo "   <button data-toggle=\"collapse\" data-target=\"#oai-l2-sim-test-details\">More details on L2-NFAPI Simulator test results</button>" >> ./test_simulator_results.html
-        echo "   <div id=\"oai-l2-sim-test-details\" class=\"collapse\">" >> ./test_simulator_results.html
-        echo "   <table border = \"1\">" >> ./test_simulator_results.html
-        echo "      <tr bgcolor = \"#33CCFF\" >" >> ./test_simulator_results.html
-        echo "        <th>Log File Name</th>" >> ./test_simulator_results.html
-        echo "        <th>Command</th>" >> ./test_simulator_results.html
-        echo "        <th>Status</th>" >> ./test_simulator_results.html
-        echo "        <th>Statistics</th>" >> ./test_simulator_results.html
-        echo "      </tr>" >> ./test_simulator_results.html
-
-        TRANS_MODES=("fdd")
-        BW_CASES=(05)
-        for TMODE in ${TRANS_MODES[@]}
-        do
-            for BW in ${BW_CASES[@]}
-            do
-                ENB_LOG=$ARCHIVES_LOC/${TMODE}_${BW}MHz_enb.log
-                UE_LOG=`echo $ENB_LOG | sed -e "s#enb#ue#"`
-                if [ -f $ENB_LOG ] && [ -f $UE_LOG ]
-                then
-                    NAME_ENB=`echo $ENB_LOG | sed -e "s#$ARCHIVES_LOC/##"`
-                    NAME_UE=`echo $UE_LOG | sed -e "s#$ARCHIVES_LOC/##"`
-                    echo "      <tr>" >> ./test_simulator_results.html
-                    echo "        <td>$NAME_ENB --- $NAME_UE</td>" >> ./test_simulator_results.html
-                    echo "        <td>N/A</td>" >> ./test_simulator_results.html
-                    NB_ENB_GOT_SYNC=`egrep -c "got sync" $ENB_LOG`
-                    NB_UE_GOT_SYNC=`egrep -c "got sync" $UE_LOG`
-                    NB_ENB_SYNCED_WITH_UE=`egrep -c "Sending NFAPI_START_RESPONSE" $UE_LOG`
-                    if [ $NB_ENB_GOT_SYNC -eq 1 ] && [ $NB_UE_GOT_SYNC -eq 3 ] && [ $NB_ENB_SYNCED_WITH_UE -eq 1 ]
-                    then
-                        echo "        <td bgcolor = \"green\" >OK</td>" >> ./test_simulator_results.html
-                    else
-                        echo "        <td bgcolor = \"red\" >KO</td>" >> ./test_simulator_results.html
-                    fi
-                    echo "        <td><pre>" >> ./test_simulator_results.html
-                    if [ $NB_ENB_GOT_SYNC -eq 1 ]
-                    then
-                        echo "<font color = \"blue\">- eNB --> got sync</font>" >> ./test_simulator_results.html
-                    else
-                        echo "<font color = \"red\"><b>- eNB NEVER got sync</b></font>" >> ./test_simulator_results.html
-                    fi
-                    if [ $NB_UE_GOT_SYNC -eq 3 ]
-                    then
-                        echo "<font color = \"blue\">- UE --> got sync</font>" >> ./test_simulator_results.html
-                    else
-                        echo "<font color = \"red\"><b>- UE NEVER got sync</b></font>" >> ./test_simulator_results.html
-                    fi
-                    if [ $NB_ENB_SYNCED_WITH_UE -eq 1 ]
-                    then
-                        echo "<font color = \"blue\">- UE attached to eNB</font>" >> ./test_simulator_results.html
-                    else
-                        echo "<font color = \"red\"><b>- UE NEVER attached to eNB</b></font>" >> ./test_simulator_results.html
-                    fi
-                    echo "        </pre></td>" >> ./test_simulator_results.html
-                    echo "      </tr>" >> ./test_simulator_results.html
-                fi
-                PING_CASE=$ARCHIVES_LOC/${TMODE}_${BW}MHz_ping_epc.txt
-                if [ -f $PING_CASE ]
-                then
-                    echo "      <tr>" >> ./test_simulator_results.html
-                    NAME=`echo $PING_CASE | sed -e "s#$ARCHIVES_LOC/##"`
-                    echo "        <td>$NAME</td>" >> ./test_simulator_results.html
-                    CMD=`egrep "COMMAND IS" $PING_CASE | sed -e "s#COMMAND IS: ##"`
-                    echo "        <td>$CMD</td>" >> ./test_simulator_results.html
-                    FILE_COMPLETE=`egrep -c "ping statistics" $PING_CASE`
-                    if [ $FILE_COMPLETE -eq 0 ]
-                    then
-                        echo "        <td bgcolor = \"red\" >KO</td>" >> ./test_simulator_results.html
-                        echo "        <td>N/A</td>" >> ./test_simulator_results.html
-                    else
-                        NB_TR_PACKETS=`egrep "packets transmitted" $PING_CASE | sed -e "s# packets transmitted.*##"`
-                        NB_RC_PACKETS=`egrep "packets transmitted" $PING_CASE | sed -e "s#^.*packets transmitted, ##" -e "s# received,.*##"`
-                        if [ $NB_TR_PACKETS -eq $NB_RC_PACKETS ]
-                        then
-                            echo "        <td bgcolor = \"green\" >OK</td>" >> ./test_simulator_results.html
-                        else
-                            echo "        <td bgcolor = \"red\" >KO</td>" >> ./test_simulator_results.html
-                        fi
-                        echo "        <td>" >> ./test_simulator_results.html
-                        echo "            <pre>" >> ./test_simulator_results.html
-                        STATS=`egrep "packets transmitted" $PING_CASE | sed -e "s#^.*received, ##" -e "s#, time.*##" -e "s# packet loss##"`
-                        echo "Packet Loss : $STATS" >> ./test_simulator_results.html
-                        RTTMIN=`egrep "rtt min" $PING_CASE | awk '{split($4,a,"/"); print a[1] " " $5}'`
-                        echo "RTT Minimal : $RTTMIN" >> ./test_simulator_results.html
-                        RTTAVG=`egrep "rtt min" $PING_CASE | awk '{split($4,a,"/"); print a[2] " " $5}'`
-                        echo "RTT Average : $RTTAVG" >> ./test_simulator_results.html
-                        RTTMAX=`egrep "rtt min" $PING_CASE | awk '{split($4,a,"/"); print a[3] " " $5}'`
-                        echo "RTT Maximal : $RTTMAX" >> ./test_simulator_results.html
-                        echo "            </pre>" >> ./test_simulator_results.html
-                        echo "        </td>" >> ./test_simulator_results.html
-                    fi
-                    echo "      </tr>" >> ./test_simulator_results.html
-                fi
-
-            done
-        done
-
-        echo "   </table>" >> ./test_simulator_results.html
-        echo "   </div>" >> ./test_simulator_results.html
     fi
 
     ARCHIVES_LOC=archives/phy_sim/test
@@ -546,24 +367,6 @@ function report_test {
     then
         echo "   <h3>Physical Simulators Check</h3>" >> ./test_simulator_results.html
 
-        if [ -f $ARCHIVES_LOC/test_final_status.log ]
-        then
-            if [ `grep -c TEST_OK $ARCHIVES_LOC/test_final_status.log` -eq 1 ]
-            then
-                echo "   <div class=\"alert alert-success\">" >> ./test_simulator_results.html
-                echo "      <strong>TEST was SUCCESSFUL <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./test_simulator_results.html
-                echo "   </div>" >> ./test_simulator_results.html
-            else
-                echo "   <div class=\"alert alert-danger\">" >> ./test_simulator_results.html
-                echo "      <strong>TEST was a FAILURE! <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./test_simulator_results.html
-                echo "   </div>" >> ./test_simulator_results.html
-            fi
-        else
-            echo "   <div class=\"alert alert-danger\">" >> ./test_simulator_results.html
-            echo "      <strong>COULD NOT DETERMINE TEST FINAL STATUS! <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./test_simulator_results.html
-            echo "   </div>" >> ./test_simulator_results.html
-        fi
-
         echo "   <table border = \"1\">" >> ./test_simulator_results.html
         echo "      <tr bgcolor = \"#33CCFF\" >" >> ./test_simulator_results.html
         echo "        <th>Log File Name</th>" >> ./test_simulator_results.html
@@ -596,10 +399,6 @@ function report_test {
         done
 
         echo "   </table>" >> ./test_simulator_results.html
-        echo "   <br>" >> ./test_simulator_results.html
-
-        echo "   <button data-toggle=\"collapse\" data-target=\"#oai-phy-sim-test-details\">More details on Physical Simulators test results</button>" >> ./test_simulator_results.html
-        echo "   <div id=\"oai-phy-sim-test-details\" class=\"collapse\">" >> ./test_simulator_results.html
 
         echo "   <h4>Details</h4>" >> ./test_simulator_results.html
         for XML_FILE in $XML_TESTS
@@ -650,9 +449,6 @@ function report_test {
         done
     fi
 
-    echo "   </div>" >> ./test_simulator_results.html
-    echo "   <p></p>" >> ./test_simulator_results.html
-    echo "   <div class=\"well well-lg\">End of Test Report -- Copyright <span class=\"glyphicon glyphicon-copyright-mark\"></span> 2018 <a href=\"http://www.openairinterface.org/\">OpenAirInterface</a>. All Rights Reserved.</div>" >> ./test_simulator_results.html
-    echo "</div></body>" >> ./test_simulator_results.html
+    echo "</body>" >> ./test_simulator_results.html
     echo "</html>" >> ./test_simulator_results.html
 }

ci-scripts/runTestOnVM.sh

@@ -61,7 +61,6 @@ function start_basic_sim_enb {
     local LOC_LOG_FILE=$4
     local LOC_NB_RBS=$5
     local LOC_CONF_FILE=$6
-    local LOC_FLEXRAN_CTL_IP_ADRR=$7
     echo "cd /home/ubuntu/tmp" > $1
     echo "echo \"sudo apt-get --yes --quiet install daemon \"" >> $1
     echo "sudo apt-get --yes install daemon >> /home/ubuntu/tmp/cmake_targets/log/daemon-install.txt 2>&1" >> $1
@@ -72,12 +71,6 @@ function start_basic_sim_enb {
     echo "cd ci-scripts/conf_files/" >> $1
     echo "cp $LOC_CONF_FILE ci-$LOC_CONF_FILE" >> $1
     echo "sed -i -e 's#N_RB_DL.*=.*;#N_RB_DL                                         = $LOC_NB_RBS;#' -e 's#CI_MME_IP_ADDR#$LOC_EPC_IP_ADDR#' -e 's#CI_ENB_IP_ADDR#$LOC_VM_IP_ADDR#' ci-$LOC_CONF_FILE" >> $1
-    if [[ $LOC_FLEXRAN_CTL_IP_ADRR =~ .*none.* ]]
-    then
-        echo "sed -i -e 's#CI_FLEXRAN_CTL_IP_ADDR#127.0.0.1#' ci-$LOC_CONF_FILE" >> $1
-    else
-        echo "sed -i -e 's#FLEXRAN_ENABLED        = .*no.*;#FLEXRAN_ENABLED        = \"yes\";#' -e 's#CI_FLEXRAN_CTL_IP_ADDR#$LOC_FLEXRAN_CTL_IP_ADRR#' ci-$LOC_CONF_FILE" >> $1
-    fi
     echo "echo \"grep N_RB_DL ci-$LOC_CONF_FILE\"" >> $1
     echo "grep N_RB_DL ci-$LOC_CONF_FILE | sed -e 's#N_RB_DL.*=#N_RB_DL =#'" >> $1
     echo "echo \"cd /home/ubuntu/tmp/cmake_targets/basic_simulator/enb/\"" >> $1
@@ -148,15 +141,6 @@ function ping_ue_ip_addr {
     rm -f $1
 }
 
-function ping_epc_ip_addr {
-    echo "echo \"COMMAND IS: ping -I oip1 -c 20 $3\" > $4" > $1
-    echo "rm -f $4" >> $1
-    echo "ping -I oip1 -c 20 $3 | tee -a $4" >> $1
-    cat $1
-    ssh -o StrictHostKeyChecking=no ubuntu@$2 < $1
-    rm -f $1
-}
-
 function check_ping_result {
     local LOC_PING_FILE=$1
     local LOC_NB_PINGS=$2
@@ -166,19 +150,16 @@ function check_ping_result {
         if [ $FILE_COMPLETE -eq 0 ]
         then
             PING_STATUS=-1
-            echo "ping file incomplete"
         else
             local ALL_PACKET_RECEIVED=`egrep -c "$LOC_NB_PINGS received" $LOC_PING_FILE`
             if [ $ALL_PACKET_RECEIVED -eq 1 ]
             then
                 echo "got all ping packets"
             else
-                echo "got NOT all ping packets"
                 PING_STATUS=-1
             fi
         fi
     else
-        echo "ping file not present"
         PING_STATUS=-1
     fi
 }
@@ -292,324 +273,17 @@ function recover_core_dump {
     fi
 }
 
-function install_epc_on_vm {
-    local LOC_EPC_VM_NAME=$1
-    local LOC_EPC_VM_CMDS=$2
-
-    if [ -d /opt/ltebox-archives/ ]
-    then
-        # Checking if all ltebox archives are available to run ltebx epc on a brand new VM
-        if [ -f /opt/ltebox-archives/ltebox_2.2.70_16_04_amd64.deb ] && [ -f /opt/ltebox-archives/etc-conf.zip ] && [ -f /opt/ltebox-archives/hss-sim.zip ]
-        then
-            echo "############################################################"
-            echo "Test EPC on VM ($EPC_VM_NAME) will be using ltebox"
-            echo "############################################################"
-            LTEBOX=1
-        fi
-    fi
-    # Here we could have other types of EPC detection
-
-    # Do we need to start the EPC VM
-    echo "EPC_VM_CMD_FILE     = $LOC_EPC_VM_CMDS"
-    IS_EPC_VM_ALIVE=`uvt-kvm list | grep -c $LOC_EPC_VM_NAME`
-    if [ $IS_EPC_VM_ALIVE -eq 0 ]
-    then
-        echo "############################################################"
-        echo "Creating test EPC VM ($LOC_EPC_VM_NAME) on Ubuntu Cloud Image base"
-        echo "############################################################"
-        uvt-kvm create $LOC_EPC_VM_NAME release=xenial --unsafe-caching
-    fi
-
-    uvt-kvm wait $LOC_EPC_VM_NAME --insecure
-    local LOC_EPC_VM_IP_ADDR=`uvt-kvm ip $LOC_EPC_VM_NAME`
-    echo "$LOC_EPC_VM_NAME has for IP addr = $LOC_EPC_VM_IP_ADDR"
-    scp -o StrictHostKeyChecking=no /etc/apt/apt.conf.d/01proxy ubuntu@$LOC_EPC_VM_IP_ADDR:/home/ubuntu
-
-    # ltebox specific actions (install and start)
-    LTE_BOX_TO_INSTALL=1
-    if [ $LTEBOX -eq 1 ]
-    then
-        echo "ls -ls /opt/ltebox/tools/start_ltebox" > $LOC_EPC_VM_CMDS
-        RESPONSE=`ssh -o StrictHostKeyChecking=no ubuntu@$LOC_EPC_VM_IP_ADDR < $LOC_EPC_VM_CMDS`
-        NB_EXES=`echo $RESPONSE | grep -c ltebox`
-        if [ $NB_EXES -eq 1 ]; then LTE_BOX_TO_INSTALL=0; fi
-    fi
-
-    if [ $LTEBOX -eq 1 ] && [ $LTE_BOX_TO_INSTALL -eq 1 ]
-    then
-        echo "############################################################"
-        echo "Copying ltebox archives into EPC VM ($LOC_EPC_VM_NAME)" 
-        echo "############################################################"
-        scp -o StrictHostKeyChecking=no /opt/ltebox-archives/ltebox_2.2.70_16_04_amd64.deb ubuntu@$LOC_EPC_VM_IP_ADDR:/home/ubuntu
-        scp -o StrictHostKeyChecking=no /opt/ltebox-archives/etc-conf.zip ubuntu@$LOC_EPC_VM_IP_ADDR:/home/ubuntu
-        scp -o StrictHostKeyChecking=no /opt/ltebox-archives/hss-sim.zip ubuntu@$LOC_EPC_VM_IP_ADDR:/home/ubuntu
-
-        echo "############################################################"
-        echo "Install EPC on EPC VM ($LOC_EPC_VM_NAME)"
-        echo "############################################################"
-        echo "sudo cp 01proxy /etc/apt/apt.conf.d/" > $LOC_EPC_VM_CMDS
-        echo "touch /home/ubuntu/.hushlogin" >> $LOC_EPC_VM_CMDS
-        echo "echo \"sudo apt-get --yes --quiet install zip openjdk-8-jre libconfuse-dev libreadline-dev liblog4c-dev libgcrypt-dev libsctp-dev python2.7 python2.7-dev daemon iperf\"" >> $LOC_EPC_VM_CMDS
-        echo "sudo apt-get update > zip-install.txt 2>&1" >> $LOC_EPC_VM_CMDS
-        echo "sudo apt-get --yes install zip openjdk-8-jre libconfuse-dev libreadline-dev liblog4c-dev libgcrypt-dev libsctp-dev python2.7 python2.7-dev daemon iperf >> zip-install.txt 2>&1" >> $LOC_EPC_VM_CMDS
-
-        # Installing HSS
-        echo "echo \"cd /opt\"" >> $LOC_EPC_VM_CMDS
-        echo "cd /opt" >> $LOC_EPC_VM_CMDS
-        echo "echo \"sudo unzip -qq /home/ubuntu/hss-sim.zip\"" >> $LOC_EPC_VM_CMDS
-        echo "sudo unzip -qq /home/ubuntu/hss-sim.zip" >> $LOC_EPC_VM_CMDS
-        echo "echo \"cd /opt/hss_sim0609\"" >> $LOC_EPC_VM_CMDS
-        echo "cd /opt/hss_sim0609" >> $LOC_EPC_VM_CMDS
-
-        # Installing ltebox
-        echo "echo \"cd /home/ubuntu\"" >> $LOC_EPC_VM_CMDS
-        echo "cd /home/ubuntu" >> $LOC_EPC_VM_CMDS
-        echo "echo \"sudo dpkg -i ltebox_2.2.70_16_04_amd64.deb \"" >> $LOC_EPC_VM_CMDS
-        echo "sudo dpkg -i ltebox_2.2.70_16_04_amd64.deb >> zip-install.txt 2>&1" >> $LOC_EPC_VM_CMDS
-
-        echo "echo \"cd /opt/ltebox/etc/\"" >> $LOC_EPC_VM_CMDS
-        echo "cd /opt/ltebox/etc/" >> $LOC_EPC_VM_CMDS
-        echo "echo \"sudo unzip -qq -o /home/ubuntu/etc-conf.zip\"" >> $LOC_EPC_VM_CMDS
-        echo "sudo unzip -qq -o /home/ubuntu/etc-conf.zip" >> $LOC_EPC_VM_CMDS
-        echo "sudo sed -i  -e 's#EPC_VM_IP_ADDRESS#$LOC_EPC_VM_IP_ADDR#' gw.conf" >> $LOC_EPC_VM_CMDS
-        echo "sudo sed -i  -e 's#EPC_VM_IP_ADDRESS#$LOC_EPC_VM_IP_ADDR#' mme.conf" >> $LOC_EPC_VM_CMDS
-
-        ssh -o StrictHostKeyChecking=no ubuntu@$LOC_EPC_VM_IP_ADDR < $LOC_EPC_VM_CMDS
-        rm -f $LOC_EPC_VM_CMDS
-    fi
-}
-
-function start_epc {
-    local LOC_EPC_VM_NAME=$1
-    local LOC_EPC_VM_CMDS=$2
-    local LOC_EPC_VM_IP_ADDR=$3
-
-    if [ $LTEBOX -eq 1 ]
-    then
-        echo "############################################################"
-        echo "Start EPC on EPC VM ($LOC_EPC_VM_NAME)"
-        echo "############################################################"
-        echo "echo \"cd /opt/hss_sim0609\"" > $LOC_EPC_VM_CMDS
-        echo "cd /opt/hss_sim0609" >> $LOC_EPC_VM_CMDS
-        echo "echo \"sudo daemon --unsafe --name=simulated_hss --chdir=/opt/hss_sim0609 ./starthss_real\"" >> $LOC_EPC_VM_CMDS
-        echo "sudo daemon --unsafe --name=simulated_hss --chdir=/opt/hss_sim0609 ./starthss_real" >> $LOC_EPC_VM_CMDS
-
-        echo "echo \"cd /opt/ltebox/tools/\"" >> $LOC_EPC_VM_CMDS
-        echo "cd /opt/ltebox/tools/" >> $LOC_EPC_VM_CMDS
-        echo "echo \"sudo ./start_ltebox\"" >> $LOC_EPC_VM_CMDS
-        echo "nohup sudo ./start_ltebox > /home/ubuntu/ltebox.txt" >> $LOC_EPC_VM_CMDS
-
-        ssh -o StrictHostKeyChecking=no ubuntu@$LOC_EPC_VM_IP_ADDR < $LOC_EPC_VM_CMDS
-        rm -f $LOC_EPC_VM_CMDS
-
-        i="0"
-        echo "ifconfig tun5 | egrep -c \"inet addr\"" > $LOC_EPC_VM_CMDS
-        while [ $i -lt 10 ]
-        do
-            sleep 2
-            CONNECTED=`ssh -o StrictHostKeyChecking=no ubuntu@$LOC_EPC_VM_IP_ADDR < $LOC_EPC_VM_CMDS`
-            if [ $CONNECTED -eq 1 ]
-            then
-                i="100"
-            else
-                i=$[$i+1]
-            fi
-        done
-        rm $LOC_EPC_VM_CMDS
-        if [ $i -lt 50 ]
-        then
-            echo "Problem w/ starting ltebox EPC"
-            echo "TEST_KO" > $ARCHIVES_LOC/test_final_status.log
-            exit -1
-        fi
-    fi
-
-    # HERE ADD ANY INSTALL ACTIONS FOR ANOTHER EPC
-
-}
-
-function retrieve_real_epc_ip_addr {
-    local LOC_EPC_VM_NAME=$1
-    local LOC_EPC_VM_CMDS=$2
-    local LOC_EPC_VM_IP_ADDR=$3
-
-    if [ $LTEBOX -eq 1 ]
-    then
-        # in our configuration file, we are using pool 5
-        echo "ifconfig tun5 | egrep \"inet addr\" | sed -e 's#^.*inet addr:##' -e 's#  P-t-P:.*\$##'" > $LOC_EPC_VM_CMDS
-        REAL_EPC_IP_ADDR=`ssh -o StrictHostKeyChecking=no ubuntu@$LOC_EPC_VM_IP_ADDR < $LOC_EPC_VM_CMDS`
-        echo "EPC IP Address     is : $REAL_EPC_IP_ADDR"
-        rm $LOC_EPC_VM_CMDS
-    fi
-}
-
-function terminate_epc {
-    if [ $LTEBOX -eq 1 ]
-    then
-        echo "echo \"cd /opt/ltebox/tools\"" > $1
-        echo "cd /opt/ltebox/tools" >> $1
-        echo "echo \"sudo ./stop_ltebox\"" >> $1
-        echo "sudo ./stop_ltebox" >> $1
-        echo "echo \"sudo daemon --name=simulated_hss --stop\"" >> $1
-        echo "sudo daemon --name=simulated_hss --stop" >> $1
-        echo "echo \"sudo killall --signal SIGKILL hss_sim\"" >> $1
-        echo "sudo killall --signal SIGKILL hss_sim" >> $1
-        ssh -o StrictHostKeyChecking=no ubuntu@$2 < $1
-        rm $1
-    fi
-}
-
-function start_flexran_ctrl {
-    echo "cd /home/ubuntu/tmp" > $1
-    echo "if [ -f cmake_targets/log/flexran_ctl_run.log ]; then rm -f cmake_targets/log/flexran_ctl_run.log cmake_targets/log/flexran_ctl_query*.log; fi" >> $1
-    echo "echo \" sudo build/rt_controller -c log_config/basic_log\"" >> $1
-    echo "nohup sudo build/rt_controller -c log_config/basic_log > cmake_targets/log/flexran_ctl_run.log 2>&1 &" >> $1
+function terminate_ltebox_epc {
+    echo "echo \"cd /opt/ltebox/tools\"" > $1
+    echo "cd /opt/ltebox/tools" >> $1
+    echo "echo \"sudo ./stop_ltebox\"" >> $1
+    echo "sudo ./stop_ltebox" >> $1
+    echo "echo \"sudo daemon --name=simulated_hss --stop\"" >> $1
+    echo "sudo daemon --name=simulated_hss --stop" >> $1
+    echo "echo \"sudo killall --signal SIGKILL hss_sim\"" >> $1
+    echo "sudo killall --signal SIGKILL hss_sim" >> $1
     ssh -o StrictHostKeyChecking=no ubuntu@$2 < $1
     rm $1
-    sleep 10
-}
-
-function stop_flexran_ctrl {
-    echo "echo \"sudo killall --signal SIGKILL rt_controller\"" > $1
-    echo "sudo killall --signal SIGKILL rt_controller" > $1
-    ssh -o StrictHostKeyChecking=no ubuntu@$2 < $1
-    rm $1
-    sleep 2
-}
-
-function query_flexran_ctrl_status {
-    local LOC_MESSAGE=$3
-    echo "cd /home/ubuntu/tmp" > $1
-    echo "echo \"------------------------------------------------------------\" > cmake_targets/log/flexran_ctl_query_${LOC_MESSAGE}.log" >> $1
-    echo "echo \"LOG_NAME: $LOC_MESSAGE\" >> cmake_targets/log/flexran_ctl_query_${LOC_MESSAGE}.log" >> $1
-    echo "echo \"------------------------------------------------------------\" >> cmake_targets/log/flexran_ctl_query_${LOC_MESSAGE}.log" >> $1
-    echo "curl http://localhost:9999/stats | jq '.' | tee -a cmake_targets/log/flexran_ctl_query_${LOC_MESSAGE}.log" >> $1
-    ssh -o StrictHostKeyChecking=no ubuntu@$2 < $1
-    rm $1
-}
-
-function build_ue_on_separate_folder {
-    echo "mkdir tmp-ue" > $1
-    echo "cd tmp-ue" >> $1
-    echo "echo \"unzip -qq -DD ../localZip.zip\"" >> $1
-    echo "unzip -qq -DD ../localZip.zip" >> $1
-
-    # We may have some adaptation to do
-    if [ -f /opt/ltebox-archives/adapt_ue_l2_sim.txt ]
-    then
-        echo "############################################################"
-        echo "Doing some adaptation on UE side"
-        echo "############################################################"
-        cat /opt/ltebox-archives/adapt_ue_l2_sim.txt >> $1
-    fi
-
-    echo "echo \"source oaienv\"" >> $1
-    echo "source oaienv" >> $1
-    echo "cd cmake_targets/" >> $1
-    echo "mkdir log" >> $1
-    echo "chmod 777 log" >> $1
-    echo "echo \"./build_oai --UE -t ETHERNET \"" >> $1
-    echo "./build_oai --UE -t ETHERNET > log/ue-build.txt 2>&1" >> $1
-    echo "cd tools" >> $1
-    echo "sudo ifconfig lo: 127.0.0.2 netmask 255.0.0.0 up" >> $1
-    echo "sudo chmod 666 /etc/iproute2/rt_tables" >> $1
-    echo "source init_nas_s1 UE" >> $1
-    echo "ifconfig" >> $1
-    ssh -o StrictHostKeyChecking=no ubuntu@$2 < $1
-    rm -f $1
-}
-
-function start_l2_sim_enb {
-    local LOC_VM_IP_ADDR=$2
-    local LOC_EPC_IP_ADDR=$3
-    local LOC_LOG_FILE=$4
-    local LOC_NB_RBS=$5
-    local LOC_CONF_FILE=$6
-    echo "cd /home/ubuntu/tmp" > $1
-    echo "echo \"sudo apt-get --yes --quiet install daemon \"" >> $1
-    echo "sudo apt-get --yes install daemon >> /home/ubuntu/tmp/cmake_targets/log/daemon-install.txt 2>&1" >> $1
-    echo "echo \"source oaienv\"" >> $1
-    echo "source oaienv" >> $1
-    echo "cd ci-scripts/conf_files/" >> $1
-    echo "cp $LOC_CONF_FILE ci-$LOC_CONF_FILE" >> $1
-    echo "sed -i -e 's#N_RB_DL.*=.*;#N_RB_DL                                         = $LOC_NB_RBS;#' -e 's#CI_MME_IP_ADDR#$LOC_EPC_IP_ADDR#' -e 's#CI_ENB_IP_ADDR#$LOC_VM_IP_ADDR#' ci-$LOC_CONF_FILE" >> $1
-    echo "echo \"grep N_RB_DL ci-$LOC_CONF_FILE\"" >> $1
-    echo "grep N_RB_DL ci-$LOC_CONF_FILE | sed -e 's#N_RB_DL.*=#N_RB_DL =#'" >> $1
-    echo "echo \"cd /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/\"" >> $1
-    echo "sudo chmod 777 /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/" >> $1
-    echo "cd /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/" >> $1
-    echo "echo \"ulimit -c unlimited && ./lte-softmodem -O /home/ubuntu/tmp/ci-scripts/conf_files/ci-$LOC_CONF_FILE\" > ./my-lte-softmodem-run.sh " >> $1
-    echo "chmod 775 ./my-lte-softmodem-run.sh" >> $1
-    echo "cat ./my-lte-softmodem-run.sh" >> $1
-    echo "if [ -e /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE ]; then sudo sudo rm -f /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE; fi" >> $1
-    echo "sudo -E daemon --inherit --unsafe --name=enb_daemon --chdir=/home/ubuntu/tmp/cmake_targets/lte_build_oai/build/ -o /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE ./my-lte-softmodem-run.sh" >> $1
-
-    ssh -o StrictHostKeyChecking=no ubuntu@$LOC_VM_IP_ADDR < $1
-    rm $1
-
-    local i="0"
-    echo "egrep -c \"Waiting for PHY_config_req\" /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE" > $1
-    while [ $i -lt 10 ]
-    do
-        sleep 5
-        CONNECTED=`ssh -o StrictHostKeyChecking=no ubuntu@$LOC_VM_IP_ADDR < $1`
-        if [ $CONNECTED -ne 0 ]
-        then
-            i="100"
-        else
-            i=$[$i+1]
-        fi
-    done
-    rm $1
-    if [ $i -lt 50 ]
-    then
-        ENB_SYNC=0
-        echo "L2-SIM eNB is NOT sync'ed: process still alive?"
-    else
-        ENB_SYNC=1
-        echo "L2-SIM eNB is sync'ed: waiting for UE(s) to connect"
-    fi
-}
-
-function start_l2_sim_ue {
-    local LOC_VM_IP_ADDR=$2
-    local LOC_LOG_FILE=$3
-    local LOC_CONF_FILE=$4
-    echo "echo \"cd /home/ubuntu/tmp-ue/cmake_targets/lte_build_oai/build/\"" >> $1
-    echo "sudo chmod 777 /home/ubuntu/tmp-ue/cmake_targets/lte_build_oai/build/" >> $1
-    echo "cd /home/ubuntu/tmp-ue/cmake_targets/lte_build_oai/build/" >> $1
-    echo "echo \"ulimit -c unlimited && ./lte-uesoftmodem -O /home/ubuntu/tmp-ue/ci-scripts/conf_files/$LOC_CONF_FILE --L2-emul 3 --num-ues 1\" > ./my-lte-softmodem-run.sh " >> $1
-    echo "chmod 775 ./my-lte-softmodem-run.sh" >> $1
-    echo "cat ./my-lte-softmodem-run.sh" >> $1
-    echo "if [ -e /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE ]; then sudo sudo rm -f /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE; fi" >> $1
-    echo "sudo -E daemon --inherit --unsafe --name=ue_daemon --chdir=/home/ubuntu/tmp-ue/cmake_targets/lte_build_oai/build/ -o /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE ./my-lte-softmodem-run.sh" >> $1
-
-    ssh -o StrictHostKeyChecking=no ubuntu@$LOC_VM_IP_ADDR < $1
-    rm $1
-
-    local i="0"
-    echo "egrep -c \"Received NFAPI_START_REQ\" /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE" > $1
-    while [ $i -lt 10 ]
-    do
-        sleep 5
-        CONNECTED=`ssh -o StrictHostKeyChecking=no ubuntu@$LOC_VM_IP_ADDR < $1`
-        if [ $CONNECTED -eq 1 ]
-        then
-            i="100"
-        else
-            i=$[$i+1]
-        fi
-    done
-    rm $1
-    if [ $i -lt 50 ]
-    then
-        UE_SYNC=0
-        echo "L2-SIM UE is NOT sync'ed w/eNB"
-    else
-        UE_SYNC=1
-        echo "L2-SIM UE is sync'ed w/eNB"
-    fi
-    sleep 10
 }
 
 function run_test_on_vm {
@@ -731,12 +405,6 @@ function run_test_on_vm {
         if [ $NB_RUNS -eq 0 ]; then STATUS=-1; fi
         if [ $NB_FAILURES -ne 0 ]; then STATUS=-1; fi
 
-        if [ $STATUS -eq 0 ]
-        then
-            echo "TEST_OK" > $ARCHIVES_LOC/test_final_status.log
-        else
-            echo "TEST_KO" > $ARCHIVES_LOC/test_final_status.log
-        fi
     fi
 
     if [[ "$RUN_OPTIONS" == "complex" ]] && [[ $VM_NAME =~ .*-basic-sim.* ]]
@@ -749,33 +417,154 @@ function run_test_on_vm {
         fi
         mkdir --parents $ARCHIVES_LOC
 
-        # Creating a VM for EPC and installing SW
         EPC_VM_NAME=`echo $VM_NAME | sed -e "s#basic-sim#epc#"`
-        EPC_VM_CMDS=${EPC_VM_NAME}_cmds.txt
         LTEBOX=0
-        install_epc_on_vm $EPC_VM_NAME $EPC_VM_CMDS
-        EPC_VM_IP_ADDR=`uvt-kvm ip $EPC_VM_NAME`
+        if [ -d /opt/ltebox-archives/ ]
+        then
+            # Checking if all ltebox archives are available to run ltebx epc on a brand new VM
+            if [ -f /opt/ltebox-archives/ltebox_2.2.70_16_04_amd64.deb ] && [ -f /opt/ltebox-archives/etc-conf.zip ] && [ -f /opt/ltebox-archives/hss-sim.zip ]
+            then
+                echo "############################################################"
+                echo "Test EPC on VM ($EPC_VM_NAME) will be using ltebox"
+                echo "############################################################"
+                LTEBOX=1
+            fi
+        fi
+        # Here we could have other types of EPC detection
 
-        # Starting EPC
-        start_epc $EPC_VM_NAME $EPC_VM_CMDS $EPC_VM_IP_ADDR
-
-        # Retrieve EPC real IP address
-        retrieve_real_epc_ip_addr $EPC_VM_NAME $EPC_VM_CMDS $EPC_VM_IP_ADDR
-
-        # We may have some adaptation to do
-        if [ -f /opt/ltebox-archives/adapt_ue_sim.txt ]
+        # Do we need to start the EPC VM
+        EPC_VM_CMDS=`echo $VM_CMDS | sed -e "s#cmds#epc-cmds#"`
+        echo "EPC_VM_CMD_FILE     = $EPC_VM_CMDS"
+        IS_EPC_VM_ALIVE=`uvt-kvm list | grep -c $EPC_VM_NAME`
+        if [ $IS_EPC_VM_ALIVE -eq 0 ]
         then
             echo "############################################################"
-            echo "Doing some adaptation on UE side"
+            echo "Creating test EPC VM ($EPC_VM_NAME) on Ubuntu Cloud Image base"
             echo "############################################################"
-            ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR < /opt/ltebox-archives/adapt_ue_sim.txt
+            uvt-kvm create $EPC_VM_NAME release=xenial --unsafe-caching
+        fi
+
+        uvt-kvm wait $EPC_VM_NAME --insecure
+        EPC_VM_IP_ADDR=`uvt-kvm ip $EPC_VM_NAME`
+        echo "$EPC_VM_NAME has for IP addr = $EPC_VM_IP_ADDR"
+        scp -o StrictHostKeyChecking=no /etc/apt/apt.conf.d/01proxy ubuntu@$EPC_VM_IP_ADDR:/home/ubuntu
+
+        # ltebox specific actions (install and start)
+        LTE_BOX_TO_INSTALL=1
+        if [ $LTEBOX -eq 1 ]
+        then
+            echo "ls -ls /opt/ltebox/tools/start_ltebox" > $EPC_VM_CMDS
+            RESPONSE=`ssh -o StrictHostKeyChecking=no ubuntu@$EPC_VM_IP_ADDR < $EPC_VM_CMDS`
+            NB_EXES=`echo $RESPONSE | grep -c ltebox`
+            if [ $NB_EXES -eq 1 ]; then LTE_BOX_TO_INSTALL=0; fi
+        fi
+
+        if [ $LTEBOX -eq 1 ] && [ $LTE_BOX_TO_INSTALL -eq 1 ]
+        then
+            echo "############################################################"
+            echo "Copying ltebox archives into EPC VM ($EPC_VM_NAME)" 
+            echo "############################################################"
+            scp -o StrictHostKeyChecking=no /opt/ltebox-archives/ltebox_2.2.70_16_04_amd64.deb ubuntu@$EPC_VM_IP_ADDR:/home/ubuntu
+            scp -o StrictHostKeyChecking=no /opt/ltebox-archives/etc-conf.zip ubuntu@$EPC_VM_IP_ADDR:/home/ubuntu
+            scp -o StrictHostKeyChecking=no /opt/ltebox-archives/hss-sim.zip ubuntu@$EPC_VM_IP_ADDR:/home/ubuntu
+
+            echo "############################################################"
+            echo "Install EPC on EPC VM ($EPC_VM_NAME)"
+            echo "############################################################"
+            echo "sudo cp 01proxy /etc/apt/apt.conf.d/" > $EPC_VM_CMDS
+            echo "touch /home/ubuntu/.hushlogin" >> $EPC_VM_CMDS
+            echo "echo \"sudo apt-get --yes --quiet install zip openjdk-8-jre libconfuse-dev libreadline-dev liblog4c-dev libgcrypt-dev libsctp-dev python2.7 python2.7-dev daemon iperf\"" >> $EPC_VM_CMDS
+            echo "sudo apt-get update > zip-install.txt 2>&1" >> $EPC_VM_CMDS
+            echo "sudo apt-get --yes install zip openjdk-8-jre libconfuse-dev libreadline-dev liblog4c-dev libgcrypt-dev libsctp-dev python2.7 python2.7-dev daemon iperf >> zip-install.txt 2>&1" >> $EPC_VM_CMDS
+
+            # Installing HSS
+            echo "echo \"cd /opt\"" >> $EPC_VM_CMDS
+            echo "cd /opt" >> $EPC_VM_CMDS
+            echo "echo \"sudo unzip -qq /home/ubuntu/hss-sim.zip\"" >> $EPC_VM_CMDS
+            echo "sudo unzip -qq /home/ubuntu/hss-sim.zip" >> $EPC_VM_CMDS
+            echo "echo \"cd /opt/hss_sim0609\"" >> $EPC_VM_CMDS
+            echo "cd /opt/hss_sim0609" >> $EPC_VM_CMDS
+
+            # Installing ltebox
+            echo "echo \"cd /home/ubuntu\"" >> $EPC_VM_CMDS
+            echo "cd /home/ubuntu" >> $EPC_VM_CMDS
+            echo "echo \"sudo dpkg -i ltebox_2.2.70_16_04_amd64.deb \"" >> $EPC_VM_CMDS
+            echo "sudo dpkg -i ltebox_2.2.70_16_04_amd64.deb >> zip-install.txt 2>&1" >> $EPC_VM_CMDS
+
+            echo "echo \"cd /opt/ltebox/etc/\"" >> $EPC_VM_CMDS
+            echo "cd /opt/ltebox/etc/" >> $EPC_VM_CMDS
+            echo "echo \"sudo unzip -qq -o /home/ubuntu/etc-conf.zip\"" >> $EPC_VM_CMDS
+            echo "sudo unzip -qq -o /home/ubuntu/etc-conf.zip" >> $EPC_VM_CMDS
+            echo "sudo sed -i  -e 's#EPC_VM_IP_ADDRESS#$EPC_VM_IP_ADDR#' gw.conf" >> $EPC_VM_CMDS
+            echo "sudo sed -i  -e 's#EPC_VM_IP_ADDRESS#$EPC_VM_IP_ADDR#' mme.conf" >> $EPC_VM_CMDS
+        fi
+
+        # Starting EPC
+        if [ $LTEBOX -eq 1 ]
+        then
+            echo "############################################################"
+            echo "Start EPC on EPC VM ($EPC_VM_NAME)"
+            echo "############################################################"
+            echo "echo \"cd /opt/hss_sim0609\"" >> $EPC_VM_CMDS
+            echo "cd /opt/hss_sim0609" >> $EPC_VM_CMDS
+            echo "echo \"sudo daemon --unsafe --name=simulated_hss --chdir=/opt/hss_sim0609 ./starthss_real\"" >> $EPC_VM_CMDS
+            echo "sudo daemon --unsafe --name=simulated_hss --chdir=/opt/hss_sim0609 ./starthss_real" >> $EPC_VM_CMDS
+
+            echo "echo \"cd /opt/ltebox/tools/\"" >> $EPC_VM_CMDS
+            echo "cd /opt/ltebox/tools/" >> $EPC_VM_CMDS
+            echo "echo \"sudo ./start_ltebox\"" >> $EPC_VM_CMDS
+            echo "nohup sudo ./start_ltebox > /home/ubuntu/ltebox.txt" >> $EPC_VM_CMDS
+
+            ssh -o StrictHostKeyChecking=no ubuntu@$EPC_VM_IP_ADDR < $EPC_VM_CMDS
+            rm -f $EPC_VM_CMDS
+
+            # We may have some adaptation to do
+            if [ -f /opt/ltebox-archives/adapt_ue_sim.txt ]
+            then
+                echo "############################################################"
+                echo "Doing some adaptation on UE side"
+                echo "############################################################"
+                ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR < /opt/ltebox-archives/adapt_ue_sim.txt
+            fi
+
+            i="0"
+            echo "ifconfig tun5 | egrep -c \"inet addr\"" > $EPC_VM_CMDS
+            while [ $i -lt 10 ]
+            do
+                sleep 2
+                CONNECTED=`ssh -o StrictHostKeyChecking=no ubuntu@$EPC_VM_IP_ADDR < $EPC_VM_CMDS`
+                if [ $CONNECTED -eq 1 ]
+                then
+                    i="100"
+                else
+                    i=$[$i+1]
+                fi
+            done
+            rm $EPC_VM_CMDS
+            if [ $i -lt 50 ]
+            then
+                echo "Problem w/ starting ltebox EPC"
+                exit -1
+            fi
+        fi
+
+        # HERE ADD ANY INSTALL ACTIONS FOR ANOTHER EPC
+
+        # Retrieve EPC real IP address
+        if [ $LTEBOX -eq 1 ]
+        then
+            # in our configuration file, we are using pool 5
+            echo "ifconfig tun5 | egrep \"inet addr\" | sed -e 's#^.*inet addr:##' -e 's#  P-t-P:.*\$##'" > $EPC_VM_CMDS
+            REAL_EPC_IP_ADDR=`ssh -o StrictHostKeyChecking=no ubuntu@$EPC_VM_IP_ADDR < $EPC_VM_CMDS`
+            echo "EPC IP Address     is : $REAL_EPC_IP_ADDR"
+            rm $EPC_VM_CMDS
         fi
 
         echo "############################################################"
         echo "Starting the eNB in FDD-5MHz mode"
         echo "############################################################"
         CURRENT_ENB_LOG_FILE=fdd_05MHz_enb.log
-        start_basic_sim_enb $VM_CMDS $VM_IP_ADDR $EPC_VM_IP_ADDR $CURRENT_ENB_LOG_FILE 25 lte-fdd-basic-sim.conf none
+        start_basic_sim_enb $VM_CMDS $VM_IP_ADDR $EPC_VM_IP_ADDR $CURRENT_ENB_LOG_FILE 25 lte-fdd-basic-sim.conf
 
         echo "############################################################"
         echo "Starting the UE in FDD-5MHz mode"
@@ -789,8 +578,7 @@ function run_test_on_vm {
             scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
             scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_UE_LOG_FILE $ARCHIVES_LOC
             recover_core_dump $VM_CMDS $VM_IP_ADDR $ARCHIVES_LOC/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
-            terminate_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
-            echo "TEST_KO" > $ARCHIVES_LOC/test_final_status.log
+            terminate_ltebox_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
             exit -1
         fi
         get_ue_ip_addr $VM_CMDS $VM_IP_ADDR
@@ -834,7 +622,7 @@ function run_test_on_vm {
         echo "Starting the eNB in FDD-10MHz mode"
         echo "############################################################"
         CURRENT_ENB_LOG_FILE=fdd_10MHz_enb.log
-        start_basic_sim_enb $VM_CMDS $VM_IP_ADDR $EPC_VM_IP_ADDR $CURRENT_ENB_LOG_FILE 50 lte-fdd-basic-sim.conf none
+        start_basic_sim_enb $VM_CMDS $VM_IP_ADDR $EPC_VM_IP_ADDR $CURRENT_ENB_LOG_FILE 50 lte-fdd-basic-sim.conf
 
         echo "############################################################"
         echo "Starting the UE in FDD-10MHz mode"
@@ -848,8 +636,7 @@ function run_test_on_vm {
             scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
             scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_UE_LOG_FILE $ARCHIVES_LOC
             recover_core_dump $VM_CMDS $VM_IP_ADDR $ARCHIVES_LOC/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
-            terminate_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
-            echo "TEST_KO" > $ARCHIVES_LOC/test_final_status.log
+            terminate_ltebox_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
             exit -1
         fi
         get_ue_ip_addr $VM_CMDS $VM_IP_ADDR
@@ -893,7 +680,7 @@ function run_test_on_vm {
         echo "Starting the eNB in FDD-20MHz mode"
         echo "############################################################"
         CURRENT_ENB_LOG_FILE=fdd_20MHz_enb.log
-        start_basic_sim_enb $VM_CMDS $VM_IP_ADDR $EPC_VM_IP_ADDR $CURRENT_ENB_LOG_FILE 100 lte-fdd-basic-sim.conf none
+        start_basic_sim_enb $VM_CMDS $VM_IP_ADDR $EPC_VM_IP_ADDR $CURRENT_ENB_LOG_FILE 100 lte-fdd-basic-sim.conf
 
         echo "############################################################"
         echo "Starting the UE in FDD-20MHz mode"
@@ -907,8 +694,7 @@ function run_test_on_vm {
             scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
             scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_UE_LOG_FILE $ARCHIVES_LOC
             recover_core_dump $VM_CMDS $VM_IP_ADDR $ARCHIVES_LOC/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
-            terminate_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
-            echo "TEST_KO" > $ARCHIVES_LOC/test_final_status.log
+            terminate_ltebox_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
             exit -1
         fi
         get_ue_ip_addr $VM_CMDS $VM_IP_ADDR
@@ -939,100 +725,11 @@ function run_test_on_vm {
         recover_core_dump $VM_CMDS $VM_IP_ADDR $ARCHIVES_LOC/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
         sleep 10
 
-        if [ -d $JENKINS_WKSP/flexran ]
-        then
-            echo "############################################################"
-            echo "Flexran testing is possible"
-            echo "############################################################"
-            local j="0"
-            while [ $j -lt 20 ]
-            do
-                if [ -e $JENKINS_WKSP/flexran/flexran_build_complete.txt ]
-                then
-                    echo "Found an proper flexran controller vm build"
-                    j="100"
-                else
-                    j=$[$j+1]
-                    sleep 30
-                fi
-            done
-            if [ $j -lt 50 ]
-            then
-                echo "ERROR: compiling flexran controller on vm went wrong"
-                terminate_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
-                echo "TEST_KO" > $ARCHIVES_LOC/test_final_status.log
-                exit -1
-            fi
-            FLEXRAN_CTL_VM_NAME=`echo $VM_NAME | sed -e "s#basic-sim#flexran-rtc#"`
-            FLEXRAN_CTL_VM_CMDS=`echo $VM_CMDS | sed -e "s#cmds#flexran-rtc-cmds#"`
-            IS_FLEXRAN_VM_ALIVE=`uvt-kvm list | grep -c $FLEXRAN_CTL_VM_NAME`
-            if [ $IS_FLEXRAN_VM_ALIVE -eq 0 ]
-            then
-                echo "ERROR: Flexran Ctl VM is not alive"
-                terminate_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
-                echo "TEST_KO" > $ARCHIVES_LOC/test_final_status.log
-                exit -1
-            fi
-            uvt-kvm wait $FLEXRAN_CTL_VM_NAME --insecure
-            FLEXRAN_CTL_VM_IP_ADDR=`uvt-kvm ip $FLEXRAN_CTL_VM_NAME`
-
-            echo "$FLEXRAN_CTL_VM_NAME has for IP addr = $FLEXRAN_CTL_VM_IP_ADDR"
-            echo "FLEXRAN_CTL_VM_CMDS     = $FLEXRAN_CTL_VM_CMDS"
-            echo "############################################################"
-            echo "Starting the FLEXRAN CONTROLLER"
-            echo "############################################################"
-            start_flexran_ctrl $FLEXRAN_CTL_VM_CMDS $FLEXRAN_CTL_VM_IP_ADDR
-            query_flexran_ctrl_status $FLEXRAN_CTL_VM_CMDS $FLEXRAN_CTL_VM_IP_ADDR 01_no_enb_connected
-
-            echo "############################################################"
-            echo "Starting the eNB in FDD-5MHz mode with Flexran ON"
-            echo "############################################################"
-            CURRENT_ENB_LOG_FILE=fdd_05fMHz_enb.log
-            start_basic_sim_enb $VM_CMDS $VM_IP_ADDR $EPC_VM_IP_ADDR $CURRENT_ENB_LOG_FILE 25 lte-fdd-basic-sim.conf $FLEXRAN_CTL_VM_IP_ADDR
-            query_flexran_ctrl_status $FLEXRAN_CTL_VM_CMDS $FLEXRAN_CTL_VM_IP_ADDR 02_enb_connected
-
-            echo "############################################################"
-            echo "Starting the UE in FDD-5MHz mode"
-            echo "############################################################"
-            CURRENT_UE_LOG_FILE=fdd_05fMHz_ue.log
-            start_basic_sim_ue $VM_CMDS $VM_IP_ADDR $CURRENT_UE_LOG_FILE 25 2680
-            if [ $UE_SYNC -eq 0 ]
-            then
-                echo "Problem w/ eNB and UE not syncing"
-                terminate_enb_ue_basic_sim $VM_CMDS $VM_IP_ADDR
-                scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
-                scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_UE_LOG_FILE $ARCHIVES_LOC
-                recover_core_dump $VM_CMDS $VM_IP_ADDR $ARCHIVES_LOC/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
-                terminate_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
-                stop_flexran_ctrl $FLEXRAN_CTL_VM_CMDS $FLEXRAN_CTL_VM_IP_ADDR
-                echo "TEST_KO" > $ARCHIVES_LOC/test_final_status.log
-                exit -1
-            fi
-            query_flexran_ctrl_status $FLEXRAN_CTL_VM_CMDS $FLEXRAN_CTL_VM_IP_ADDR 03_enb_ue_connected
-            get_ue_ip_addr $VM_CMDS $VM_IP_ADDR
-
-            sleep 30
-            echo "############################################################"
-            echo "Terminate enb/ue simulators"
-            echo "############################################################"
-            terminate_enb_ue_basic_sim $VM_CMDS $VM_IP_ADDR
-            scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
-            scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_UE_LOG_FILE $ARCHIVES_LOC
-            recover_core_dump $VM_CMDS $VM_IP_ADDR $ARCHIVES_LOC/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
-            sleep 10
-
-            echo "############################################################"
-            echo "Stopping the FLEXRAN CONTROLLER"
-            echo "############################################################"
-            stop_flexran_ctrl $FLEXRAN_CTL_VM_CMDS $FLEXRAN_CTL_VM_IP_ADDR
-            scp -o StrictHostKeyChecking=no ubuntu@$FLEXRAN_CTL_VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/flexran_ctl_*.log $ARCHIVES_LOC
-        fi
-
         echo "############################################################"
         echo "Starting the eNB in TDD-5MHz mode"
         echo "############################################################"
         CURRENT_ENB_LOG_FILE=tdd_05MHz_enb.log
-        start_basic_sim_enb $VM_CMDS $VM_IP_ADDR $EPC_VM_IP_ADDR $CURRENT_ENB_LOG_FILE 25 lte-tdd-basic-sim.conf none
+        start_basic_sim_enb $VM_CMDS $VM_IP_ADDR $EPC_VM_IP_ADDR $CURRENT_ENB_LOG_FILE 25 lte-tdd-basic-sim.conf
 
         echo "############################################################"
         echo "Starting the UE in TDD-5MHz mode"
@@ -1046,8 +743,7 @@ function run_test_on_vm {
             scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
             scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_UE_LOG_FILE $ARCHIVES_LOC
             recover_core_dump $VM_CMDS $VM_IP_ADDR $ARCHIVES_LOC/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
-            terminate_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
-            echo "TEST_KO" > $ARCHIVES_LOC/test_final_status.log
+            terminate_ltebox_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
             exit -1
         fi
         get_ue_ip_addr $VM_CMDS $VM_IP_ADDR
@@ -1083,7 +779,7 @@ function run_test_on_vm {
         echo "Starting the eNB in TDD-10MHz mode"
         echo "############################################################"
         CURRENT_ENB_LOG_FILE=tdd_10MHz_enb.log
-        start_basic_sim_enb $VM_CMDS $VM_IP_ADDR $EPC_VM_IP_ADDR $CURRENT_ENB_LOG_FILE 50 lte-tdd-basic-sim.conf none
+        start_basic_sim_enb $VM_CMDS $VM_IP_ADDR $EPC_VM_IP_ADDR $CURRENT_ENB_LOG_FILE 50 lte-tdd-basic-sim.conf
 
         echo "############################################################"
         echo "Starting the UE in TDD-10MHz mode"
@@ -1097,8 +793,7 @@ function run_test_on_vm {
             scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
             scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_UE_LOG_FILE $ARCHIVES_LOC
             recover_core_dump $VM_CMDS $VM_IP_ADDR $ARCHIVES_LOC/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
-            terminate_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
-            echo "TEST_KO" > $ARCHIVES_LOC/test_final_status.log
+            terminate_ltebox_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
             exit -1
         fi
         get_ue_ip_addr $VM_CMDS $VM_IP_ADDR
@@ -1129,62 +824,63 @@ function run_test_on_vm {
         recover_core_dump $VM_CMDS $VM_IP_ADDR $ARCHIVES_LOC/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
         sleep 10
 
-# Disabling TDD-20MHz in order to stop getting false negatives
-#        echo "############################################################"
-#        echo "Starting the eNB in TDD-20MHz mode"
-#        echo "############################################################"
-#        CURRENT_ENB_LOG_FILE=tdd_20MHz_enb.log
-#        start_basic_sim_enb $VM_CMDS $VM_IP_ADDR $EPC_VM_IP_ADDR $CURRENT_ENB_LOG_FILE 100 lte-tdd-basic-sim.conf none
-#
-#        echo "############################################################"
-#        echo "Starting the UE in TDD-20MHz mode"
-#        echo "############################################################"
-#        CURRENT_UE_LOG_FILE=tdd_20MHz_ue.log
-#        start_basic_sim_ue $VM_CMDS $VM_IP_ADDR $CURRENT_UE_LOG_FILE 100 2350
-#        if [ $UE_SYNC -eq 0 ]
-#        then
-#            echo "Problem w/ eNB and UE not syncing"
-#            terminate_enb_ue_basic_sim $VM_CMDS $VM_IP_ADDR
-#            scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
-#            scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_UE_LOG_FILE $ARCHIVES_LOC
-#            recover_core_dump $VM_CMDS $VM_IP_ADDR $ARCHIVES_LOC/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
-#            terminate_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
-#            echo "TEST_KO" > $ARCHIVES_LOC/test_final_status.log
-#            exit -1
-#        fi
-#        get_ue_ip_addr $VM_CMDS $VM_IP_ADDR
-#
-#        echo "############################################################"
-#        echo "Pinging the UE"
-#        echo "############################################################"
-#        PING_LOG_FILE=tdd_20MHz_ping_ue.txt
-#        ping_ue_ip_addr $EPC_VM_CMDS $EPC_VM_IP_ADDR $UE_IP_ADDR $PING_LOG_FILE
-#        scp -o StrictHostKeyChecking=no ubuntu@$EPC_VM_IP_ADDR:/home/ubuntu/$PING_LOG_FILE $ARCHIVES_LOC
-#        check_ping_result $ARCHIVES_LOC/$PING_LOG_FILE 20
-#
-#        echo "############################################################"
-#        echo "Iperf DL"
-#        echo "############################################################"
-#        CURR_IPERF_LOG_BASE=tdd_20MHz_iperf_dl
-#        iperf_dl $VM_CMDS $VM_IP_ADDR $EPC_VM_CMDS $EPC_VM_IP_ADDR 6 $CURR_IPERF_LOG_BASE
-#        scp -o StrictHostKeyChecking=no ubuntu@$EPC_VM_IP_ADDR:/home/ubuntu/${CURR_IPERF_LOG_BASE}_client.txt $ARCHIVES_LOC
-#        scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/${CURR_IPERF_LOG_BASE}_server.txt $ARCHIVES_LOC
-#        check_iperf $ARCHIVES_LOC/$CURR_IPERF_LOG_BASE 6
-#
-#        echo "############################################################"
-#        echo "Terminate enb/ue simulators"
-#        echo "############################################################"
-#        terminate_enb_ue_basic_sim $VM_CMDS $VM_IP_ADDR
-#        scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
-#        scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_UE_LOG_FILE $ARCHIVES_LOC
-#        recover_core_dump $VM_CMDS $VM_IP_ADDR $ARCHIVES_LOC/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
-#        sleep 10
+        echo "############################################################"
+        echo "Starting the eNB in TDD-20MHz mode"
+        echo "############################################################"
+        CURRENT_ENB_LOG_FILE=tdd_20MHz_enb.log
+        start_basic_sim_enb $VM_CMDS $VM_IP_ADDR $EPC_VM_IP_ADDR $CURRENT_ENB_LOG_FILE 100 lte-tdd-basic-sim.conf
+
+        echo "############################################################"
+        echo "Starting the UE in TDD-20MHz mode"
+        echo "############################################################"
+        CURRENT_UE_LOG_FILE=tdd_20MHz_ue.log
+        start_basic_sim_ue $VM_CMDS $VM_IP_ADDR $CURRENT_UE_LOG_FILE 100 2350
+        if [ $UE_SYNC -eq 0 ]
+        then
+            echo "Problem w/ eNB and UE not syncing"
+            terminate_enb_ue_basic_sim $VM_CMDS $VM_IP_ADDR
+            scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
+            scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_UE_LOG_FILE $ARCHIVES_LOC
+            recover_core_dump $VM_CMDS $VM_IP_ADDR $ARCHIVES_LOC/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
+            terminate_ltebox_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
+            exit -1
+        fi
+        get_ue_ip_addr $VM_CMDS $VM_IP_ADDR
+
+        echo "############################################################"
+        echo "Pinging the UE"
+        echo "############################################################"
+        PING_LOG_FILE=tdd_20MHz_ping_ue.txt
+        ping_ue_ip_addr $EPC_VM_CMDS $EPC_VM_IP_ADDR $UE_IP_ADDR $PING_LOG_FILE
+        scp -o StrictHostKeyChecking=no ubuntu@$EPC_VM_IP_ADDR:/home/ubuntu/$PING_LOG_FILE $ARCHIVES_LOC
+        check_ping_result $ARCHIVES_LOC/$PING_LOG_FILE 20
+
+        echo "############################################################"
+        echo "Iperf DL"
+        echo "############################################################"
+        CURR_IPERF_LOG_BASE=tdd_20MHz_iperf_dl
+        iperf_dl $VM_CMDS $VM_IP_ADDR $EPC_VM_CMDS $EPC_VM_IP_ADDR 6 $CURR_IPERF_LOG_BASE
+        scp -o StrictHostKeyChecking=no ubuntu@$EPC_VM_IP_ADDR:/home/ubuntu/${CURR_IPERF_LOG_BASE}_client.txt $ARCHIVES_LOC
+        scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/${CURR_IPERF_LOG_BASE}_server.txt $ARCHIVES_LOC
+        check_iperf $ARCHIVES_LOC/$CURR_IPERF_LOG_BASE 6
+
+        echo "############################################################"
+        echo "Terminate enb/ue simulators"
+        echo "############################################################"
+        terminate_enb_ue_basic_sim $VM_CMDS $VM_IP_ADDR
+        scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
+        scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_UE_LOG_FILE $ARCHIVES_LOC
+        recover_core_dump $VM_CMDS $VM_IP_ADDR $ARCHIVES_LOC/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
+        sleep 10
 
         echo "############################################################"
         echo "Terminate EPC"
         echo "############################################################"
 
-        terminate_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
+        if [ $LTEBOX -eq 1 ]
+        then
+            terminate_ltebox_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
+        fi
 
         if [ $KEEP_VM_ALIVE -eq 0 ]
         then
@@ -1195,11 +891,6 @@ function run_test_on_vm {
             ssh-keygen -R $VM_IP_ADDR
             uvt-kvm destroy $EPC_VM_NAME
             ssh-keygen -R $EPC_VM_IP_ADDR
-            if [ -e $JENKINS_WKSP/flexran/flexran_build_complete.txt ]
-            then
-                uvt-kvm destroy $FLEXRAN_CTL_VM_NAME
-                ssh-keygen -R $FLEXRAN_CTL_VM_IP_ADDR
-            fi
         fi
 
         echo "############################################################"
@@ -1209,104 +900,5 @@ function run_test_on_vm {
         if [ $PING_STATUS -ne 0 ]; then STATUS=-1; fi
         if [ $IPERF_STATUS -ne 0 ]; then STATUS=-1; fi
 
-        if [ $STATUS -eq 0 ]
-        then
-            echo "TEST_OK" > $ARCHIVES_LOC/test_final_status.log
-        else
-            echo "TEST_KO" > $ARCHIVES_LOC/test_final_status.log
-        fi
-    fi
-
-    if [[ "$RUN_OPTIONS" == "complex" ]] && [[ $VM_NAME =~ .*-l2-sim.* ]]
-    then
-        PING_STATUS=0
-        IPERF_STATUS=0
-        if [ -d $ARCHIVES_LOC ]
-        then
-            rm -Rf $ARCHIVES_LOC
-        fi
-        mkdir --parents $ARCHIVES_LOC
-
-        # Building UE elsewhere in VM
-        build_ue_on_separate_folder $VM_CMDS $VM_IP_ADDR
-
-        # Creating a VM for EPC and installing SW
-        EPC_VM_NAME=`echo $VM_NAME | sed -e "s#l2-sim#l2-epc#"`
-        EPC_VM_CMDS=${EPC_VM_NAME}_cmds.txt
-        LTEBOX=0
-        install_epc_on_vm $EPC_VM_NAME $EPC_VM_CMDS
-        EPC_VM_IP_ADDR=`uvt-kvm ip $EPC_VM_NAME`
-
-        # Starting EPC
-        start_epc $EPC_VM_NAME $EPC_VM_CMDS $EPC_VM_IP_ADDR
-
-        # Retrieve EPC real IP address
-        retrieve_real_epc_ip_addr $EPC_VM_NAME $EPC_VM_CMDS $EPC_VM_IP_ADDR
-
-        echo "############################################################"
-        echo "Starting the eNB in FDD-5MHz mode"
-        echo "############################################################"
-        CURRENT_ENB_LOG_FILE=fdd_05MHz_enb.log
-        start_l2_sim_enb $VM_CMDS $VM_IP_ADDR $EPC_VM_IP_ADDR $CURRENT_ENB_LOG_FILE 25 rcc.band7.tm1.nfapi.conf
-
-        echo "############################################################"
-        echo "Starting the UEs"
-        echo "############################################################"
-        CURRENT_UE_LOG_FILE=fdd_05MHz_ue.log
-        start_l2_sim_ue $VM_CMDS $VM_IP_ADDR $CURRENT_UE_LOG_FILE ue.nfapi.conf
-        if [ $UE_SYNC -eq 0 ]
-        then
-            echo "Problem w/ eNB and UE not syncing"
-            terminate_enb_ue_basic_sim $VM_CMDS $VM_IP_ADDR
-            scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
-            scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_UE_LOG_FILE $ARCHIVES_LOC
-            terminate_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
-            echo "TEST_KO" > $ARCHIVES_LOC/test_final_status.log
-            exit -1
-        fi
-
-        echo "############################################################"
-        echo "Pinging the EPC from UE"
-        echo "############################################################"
-        PING_LOG_FILE=fdd_05MHz_ping_epc.txt
-        ping_epc_ip_addr $VM_CMDS $VM_IP_ADDR $REAL_EPC_IP_ADDR $PING_LOG_FILE
-        scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/$PING_LOG_FILE $ARCHIVES_LOC
-        check_ping_result $ARCHIVES_LOC/$PING_LOG_FILE 20
-
-        echo "############################################################"
-        echo "Terminate enb/ue simulators"
-        echo "############################################################"
-        terminate_enb_ue_basic_sim $VM_CMDS $VM_IP_ADDR
-        scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
-        scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_UE_LOG_FILE $ARCHIVES_LOC
-
-        echo "############################################################"
-        echo "Terminate EPC"
-        echo "############################################################"
-
-        terminate_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
-
-        if [ $KEEP_VM_ALIVE -eq 0 ]
-        then
-            echo "############################################################"
-            echo "Destroying VMs"
-            echo "############################################################"
-            uvt-kvm destroy $VM_NAME
-            ssh-keygen -R $VM_IP_ADDR
-            uvt-kvm destroy $EPC_VM_NAME
-            ssh-keygen -R $EPC_VM_IP_ADDR
-        fi
-
-        echo "############################################################"
-        echo "Checking run status"
-        echo "############################################################"
-
-        if [ $PING_STATUS -ne 0 ]; then STATUS=-1; fi
-        if [ $STATUS -eq 0 ]
-        then
-            echo "TEST_OK" > $ARCHIVES_LOC/test_final_status.log
-        else
-            echo "TEST_KO" > $ARCHIVES_LOC/test_final_status.log
-        fi
     fi
 }

ci-scripts/tcp_iperf_stats.awk

@@ -1,23 +1,3 @@
-#/*
-# * 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.1  (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
-# */
 BEGIN{max=0;min=10000}
 {
     if ($0 ~/Mbits/) {

ci-scripts/waitBuildOnVM.sh

@@ -136,12 +136,7 @@ function check_on_vm_build {
     echo "Checking build status" 
     echo "############################################################"
 
-    if [[ "$VM_NAME" == *"-cppcheck"* ]]
-    then
-        LOG_FILES=`ls $ARCHIVES_LOC/*.txt $ARCHIVES_LOC/*.xml`
-    else
-        LOG_FILES=`ls $ARCHIVES_LOC/*.txt`
-    fi
+    LOG_FILES=`ls $ARCHIVES_LOC/*.txt $ARCHIVES_LOC/*.xml`
     STATUS=0
     NB_FOUND_FILES=0
 
@@ -170,25 +165,6 @@ function check_on_vm_build {
         fi
     done
 
-    if [ $NB_PATTERN_FILES -ne $NB_FOUND_FILES ]
-    then
-        echo "Expecting $NB_PATTERN_FILES log files and found $NB_FOUND_FILES"
-        STATUS=-1
-    fi
+    if [ $NB_PATTERN_FILES -ne $NB_FOUND_FILES ]; then STATUS=-1; fi
 
-    # If we were building the FlexRan Controller, flag-touch for basic-simulator to continue
-    if [[ "$VM_NAME" == *"-flexran-rtc"* ]]
-    then
-        if [[ $STATUS -eq 0 ]]
-        then
-            touch $JENKINS_WKSP/flexran/flexran_build_complete.txt
-        fi
-    fi
-
-    if [[ $STATUS -eq 0 ]]
-    then
-        echo "BUILD_OK" > $ARCHIVES_LOC/build_final_status.log
-    else
-        echo "BUILD_KO" > $ARCHIVES_LOC/build_final_status.log
-    fi
 }

ci-scripts/xml_files/enb_usrp210_band40_build.xml

@@ -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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>build-tab</htmlTabRef>
-	<htmlTabName>Build</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 010101
- 050101 060101 070101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="010101">
-		<class>Build_eNB</class>
-		<desc>Build eNB (USRP)</desc>
-		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
-	</testCase>
-
-        <testCase id="050101">
-		<class>Initialize_HSS</class>
-		<desc>Initialize HSS</desc>
-        </testCase>
-
-	<testCase id="060101">
-		<class>Initialize_MME</class>
-		<desc>Initialize MME</desc>
-	</testCase>
-
-	<testCase id="070101">
-		<class>Initialize_SPGW</class>
-		<desc>Initialize SPGW</desc>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/enb_usrp210_band40_epc_closure.xml

@@ -1,47 +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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>epc-closure</htmlTabRef>
-	<htmlTabName>EPC-Closure</htmlTabName>
-	<htmlTabIcon>log-out</htmlTabIcon>
-        <TestCaseRequestedList>
- 050201 060201 070201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="050201">
-                <class>Terminate_HSS</class>
-                <desc>Terminate HSS</desc>
-        </testCase>
-
-        <testCase id="060201">
-                <class>Terminate_MME</class>
-                <desc>Terminate MME</desc>
-        </testCase>
-
-        <testCase id="070201">
-                <class>Terminate_SPGW</class>
-                <desc>Terminate SPGW</desc>
-        </testCase>
-
-</testCaseList>

ci-scripts/xml_files/enb_usrp210_band40_test_05mhz_tm1.xml

@@ -1,119 +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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>test-05-tm1</htmlTabRef>
-	<htmlTabName>Test-05MHz-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
- 040101
- 030104 040301 040501 040602 040601 040603 040642 040641 040643 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030104">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (TDD/Band40/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
-
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
-
-        <testCase id="040501">
-                <class>Ping</class>
-                <desc>ping (5MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>25</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="040601">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
-		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-        </testCase>
-
-        <testCase id="040602">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
-		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
-
-        <testCase id="040603">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(unbalanced)</desc>
-		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-        </testCase>
-
-	<testCase id="040641">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040642">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040643">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/enb_usrp210_band40_test_20mhz_tm1.xml

@@ -1,119 +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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>test-20-tm1</htmlTabRef>
-	<htmlTabName>Test-20MHz-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
- 040101
- 030124 040301 040521 040622 040621 040623 040662 040661 040663 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030124">
-                <class>Initialize_eNB</class>
-                <desc>Initialize eNB (TDD/Band40/20MHz/info)</desc>
-                <Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
-        </testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
-
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
-
-        <testCase id="040521">
-                <class>Ping</class>
-                <desc>ping (20MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>25</ping_packetloss_threshold>
-        </testCase>
-
-	<testCase id="040621">
-                <class>Iperf</class>
-                <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
-                <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
-                <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-                <iperf_profile>balanced</iperf_profile>
-        </testCase>
-
-        <testCase id="040622">
-                <class>Iperf</class>
-                <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
-                <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
-                <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-                <iperf_profile>single-ue</iperf_profile>
-        </testCase>
-
-	<testCase id="040623">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(unbalanced)</desc>
-		<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040661">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040662">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040663">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/enb_usrp210_band40_tracer.xml

@@ -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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>tracer-test</htmlTabRef>
-	<htmlTabName>T-Tracer</htmlTabName>
-	<htmlTabIcon>duplicate</htmlTabIcon>
-        <TestCaseRequestedList>
- 040101
- 030100 040300 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030100">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (TDD/Band40/5MHz) with T Tracer on</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf --T_stdout 0</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-        <testCase id="040300">
-                <class>Attach_UE</class>
-                <desc>Attach single UE</desc>
-                <nbMaxUEtoAttach>1</nbMaxUEtoAttach>
-        </testCase>
-
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
-
-</testCaseList>

ci-scripts/xml_files/enb_usrp210_band7.xml

@@ -0,0 +1,350 @@
+<!--
+
+ 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.1  (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
+
+-->
+<testCaseList>
+	<TestCaseRequestedList>
+ 010101
+ 050101 060101 070101 040101
+ 030101 040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201 030201
+ 030111 040301 040511 040613 040614 040615 040616 040617 040651 040652 040653 040654 040401 040201 030201
+ 030121 040301 040521 040623 040624 040625 040626 040627 040662 040661 040663 040664 040401 040201 030201
+ 050201 060201 070201
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="010101">
+		<class>Build_eNB</class>
+		<desc>Build eNB (USRP)</desc>
+		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
+	</testCase>
+
+	<testCase id="030101">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf</Initialize_eNB_args>
+	</testCase>
+
+	<testCase id="030111">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB (FDD/Band7/10MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf</Initialize_eNB_args>
+	</testCase>
+
+	<testCase id="030121">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB (FDD/Band7/20MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf</Initialize_eNB_args>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate eNB</desc>
+	</testCase>
+
+	<testCase id="040101">
+		<class>Initialize_UE</class>
+		<desc>Initialize UE</desc>
+	</testCase>
+
+	<testCase id="040201">
+		<class>Terminate_UE</class>
+		<desc>Terminate UE</desc>
+	</testCase>
+
+        <testCase id="040301">
+                <class>Attach_UE</class>
+                <desc>Attach UE</desc>
+        </testCase>
+
+        <testCase id="040401">
+                <class>Detach_UE</class>
+                <desc>Detach UE</desc>
+        </testCase>
+
+        <testCase id="040501">
+                <class>Ping</class>
+                <desc>ping (5MHz - 20 sec)</desc>
+                <ping_args>-c 20</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="040511">
+                <class>Ping</class>
+                <desc>ping (10MHz - 20 sec)</desc>
+                <ping_args>-c 20</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="040521">
+                <class>Ping</class>
+                <desc>ping (20MHz - 20 sec)</desc>
+                <ping_args>-c 20</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="040603">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
+		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+        </testCase>
+
+        <testCase id="040604">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+        </testCase>
+
+        <testCase id="040605">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(unbalanced profile)</desc>
+		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>unbalanced</iperf_profile>
+        </testCase>
+
+        <testCase id="040606">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+        </testCase>
+
+        <testCase id="040607">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/TCP)(30 sec)(balanced profile)</desc>
+		<iperf_args>-t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+        </testCase>
+
+	<testCase id="040641">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
+		<iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+	<testCase id="040642">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+        <testCase id="040643">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+        </testCase>
+
+        <testCase id="040644">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/TCP)(30 sec)(balanced profile)</desc>
+		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+        </testCase>
+
+        <testCase id="040613">
+		<class>Iperf</class>
+		<desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
+		<iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+        </testCase>
+
+        <testCase id="040614">
+		<class>Iperf</class>
+		<desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+        </testCase>
+
+        <testCase id="040615">
+		<class>Iperf</class>
+		<desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(unbalanced profile)</desc>
+		<iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>unbalanced</iperf_profile>
+        </testCase>
+
+        <testCase id="040616">
+		<class>Iperf</class>
+		<desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+        </testCase>
+
+        <testCase id="040617">
+		<class>Iperf</class>
+		<desc>iperf (10MHz - DL/TCP)(30 sec)(balanced profile)</desc>
+		<iperf_args>-t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+        </testCase>
+
+	<testCase id="040651">
+		<class>Iperf</class>
+		<desc>iperf (10MHz - UL/20Mbps/UDP)(30 sec)(balanced profile)</desc>
+		<iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+	<testCase id="040652">
+		<class>Iperf</class>
+		<desc>iperf (10MHz - UL/20Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+        <testCase id="040653">
+		<class>Iperf</class>
+		<desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+        </testCase>
+
+        <testCase id="040654">
+		<class>Iperf</class>
+		<desc>iperf (10MHz - UL/TCP)(30 sec)(balanced profile)</desc>
+		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+        </testCase>
+
+        <testCase id="040623">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(balanced profile)</desc>
+		<iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+        </testCase>
+
+        <testCase id="040624">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+        </testCase>
+
+        <testCase id="040625">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(unbalanced profile)</desc>
+		<iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>unbalanced</iperf_profile>
+        </testCase>
+
+        <testCase id="040626">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+        </testCase>
+
+        <testCase id="040627">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - DL/TCP)(30 sec)(balanced profile)</desc>
+		<iperf_args>-t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+        </testCase>
+
+	<testCase id="040661">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - UL/20Mbps/UDP)(30 sec)(balanced profile)</desc>
+		<iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+	<testCase id="040662">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - UL/20Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+        <testCase id="040663">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+        </testCase>
+
+        <testCase id="040664">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - UL/TCP)(30 sec)(balanced profile)</desc>
+		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+        </testCase>
+
+        <testCase id="050101">
+		<class>Initialize_HSS</class>
+		<desc>Initialize HSS</desc>
+        </testCase>
+
+	<testCase id="060101">
+		<class>Initialize_MME</class>
+		<desc>Initialize MME</desc>
+	</testCase>
+
+	<testCase id="070101">
+		<class>Initialize_SPGW</class>
+		<desc>Initialize SPGW</desc>
+	</testCase>
+
+	<testCase id="050201">
+		<class>Terminate_HSS</class>
+		<desc>Terminate HSS</desc>
+	</testCase>
+
+	<testCase id="060201">
+		<class>Terminate_MME</class>
+		<desc>Terminate MME</desc>
+	</testCase>
+
+	<testCase id="070201">
+		<class>Terminate_SPGW</class>
+		<desc>Terminate SPGW</desc>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/enb_usrp210_band7_build.xml

@@ -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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>build-tab</htmlTabRef>
-	<htmlTabName>Build</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 010101
- 050101 060101 070101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="010101">
-		<class>Build_eNB</class>
-		<desc>Build eNB (USRP)</desc>
-		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
-	</testCase>
-
-        <testCase id="050101">
-		<class>Initialize_HSS</class>
-		<desc>Initialize HSS</desc>
-        </testCase>
-
-	<testCase id="060101">
-		<class>Initialize_MME</class>
-		<desc>Initialize MME</desc>
-	</testCase>
-
-	<testCase id="070101">
-		<class>Initialize_SPGW</class>
-		<desc>Initialize SPGW</desc>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/enb_usrp210_band7_epc_closure.xml

@@ -1,47 +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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>epc-closure</htmlTabRef>
-	<htmlTabName>EPC-Closure</htmlTabName>
-	<htmlTabIcon>log-out</htmlTabIcon>
-	<TestCaseRequestedList>
- 050201 060201 070201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="050201">
-		<class>Terminate_HSS</class>
-		<desc>Terminate HSS</desc>
-	</testCase>
-
-	<testCase id="060201">
-		<class>Terminate_MME</class>
-		<desc>Terminate MME</desc>
-	</testCase>
-
-	<testCase id="070201">
-		<class>Terminate_SPGW</class>
-		<desc>Terminate SPGW</desc>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1.xml

@@ -1,143 +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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>test-05-tm1</htmlTabRef>
-	<htmlTabName>Test-05MHz-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<TestCaseRequestedList>
- 040101
- 030101 040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030101">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
-
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
-
-        <testCase id="040501">
-                <class>Ping</class>
-                <desc>ping (5MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="040603">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-        </testCase>
-
-        <testCase id="040604">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
-
-        <testCase id="040605">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(unbalanced profile)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-        </testCase>
-
-        <testCase id="040606">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
-
-        <testCase id="040607">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/TCP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-        </testCase>
-
-	<testCase id="040641">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040642">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-        <testCase id="040643">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
-
-        <testCase id="040644">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-        </testCase>
-
-</testCaseList>

ci-scripts/xml_files/enb_usrp210_band7_test_10mhz_tm1.xml

@@ -1,143 +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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>test-10-tm1</htmlTabRef>
-	<htmlTabName>Test-10MHz-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<TestCaseRequestedList>
- 040101
- 030111 040301 040511 040613 040614 040615 040616 040617 040651 040652 040653 040654 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030111">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/10MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
-
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
-
-        <testCase id="040511">
-                <class>Ping</class>
-                <desc>ping (10MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="040613">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-        </testCase>
-
-        <testCase id="040614">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
-
-        <testCase id="040615">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(unbalanced profile)</desc>
-		<iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-        </testCase>
-
-        <testCase id="040616">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
-
-        <testCase id="040617">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - DL/TCP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-        </testCase>
-
-	<testCase id="040651">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - UL/20Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040652">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - UL/20Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-        <testCase id="040653">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
-
-        <testCase id="040654">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-        </testCase>
-
-</testCaseList>

ci-scripts/xml_files/enb_usrp210_band7_test_20mhz_tm1.xml

@@ -1,143 +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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>test-20-tm1</htmlTabRef>
-	<htmlTabName>Test-20MHz-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<TestCaseRequestedList>
- 040101
- 030121 040301 040521 040623 040624 040625 040662 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>040626 040627 040661 040663 040664</TestCaseExclusionList>
-
-	<testCase id="030121">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/20MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
-
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
-
-        <testCase id="040521">
-                <class>Ping</class>
-                <desc>ping (20MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="040623">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-        </testCase>
-
-        <testCase id="040624">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
-
-        <testCase id="040625">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(unbalanced profile)</desc>
-		<iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-        </testCase>
-
-        <testCase id="040626">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
-
-        <testCase id="040627">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/TCP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-        </testCase>
-
-	<testCase id="040661">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/12Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 12M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040662">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/17Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 17M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-        <testCase id="040663">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
-
-        <testCase id="040664">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-        </testCase>
-
-</testCaseList>

ci-scripts/xml_files/enb_usrp210_band7_tracer.xml

@@ -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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>tracer-test</htmlTabRef>
-	<htmlTabName>T-Tracer</htmlTabName>
-	<htmlTabIcon>duplicate</htmlTabIcon>
-	<TestCaseRequestedList>
- 040101
- 030100 040300 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030100">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/5MHz) with T Tracer on</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --T_stdout 0</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-        <testCase id="040300">
-                <class>Attach_UE</class>
-                <desc>Attach single UE</desc>
-                <nbMaxUEtoAttach>1</nbMaxUEtoAttach>
-        </testCase>
-
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
-
-</testCaseList>

ci-scripts/xml_files/enb_usrpb210_band40.xml

@@ -21,21 +21,43 @@
 
 -->
 <testCaseList>
-	<htmlTabRef>test-10-tm1</htmlTabRef>
-	<htmlTabName>Test-10MHz-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
         <TestCaseRequestedList>
- 040101
+ 010101
+ 050101 060101 070101 040101
+ 030104 040301 040501 040602 040601 040603 040642 040641 040643 040401 040201 030201
  030114 040301 040511 040612 040611 040613 040652 040651 040653 040401 040201 030201
+ 050201 060201 070201
 	</TestCaseRequestedList>
+	<!-- 20MHz is not stable enough to be run -->
+	<!--
+ 030124 040301 040521 040622 040621 040623 040662 040661 040663 040401 040201 030201
+	-->
 	<TestCaseExclusionList></TestCaseExclusionList>
 
+	<testCase id="010101">
+		<class>Build_eNB</class>
+		<desc>Build eNB (USRP)</desc>
+		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
+	</testCase>
+
+	<testCase id="030104">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB (TDD/Band40/5MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
+	</testCase>
+	
 	<testCase id="030114">
                 <class>Initialize_eNB</class>
                 <desc>Initialize eNB (TDD/Band40/10MHz/info)</desc>
                 <Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
         </testCase>
 
+	<testCase id="030106">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB (TDD/Band40/20MHz/info)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
+	</testCase>
+
 	<testCase id="030201">
 		<class>Terminate_eNB</class>
 		<desc>Terminate eNB</desc>
@@ -61,6 +83,13 @@
                 <desc>Detach UE</desc>
         </testCase>
 
+        <testCase id="040501">
+                <class>Ping</class>
+                <desc>ping (5MHz - 20 sec)</desc>
+                <ping_args>-c 20</ping_args>
+                <ping_packetloss_threshold>25</ping_packetloss_threshold>
+        </testCase>
+
         <testCase id="040511">
                 <class>Ping</class>
                 <desc>ping (10MHz - 20 sec)</desc>
@@ -68,6 +97,30 @@
                 <ping_packetloss_threshold>25</ping_packetloss_threshold>
         </testCase>
 
+        <testCase id="040601">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
+		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+        </testCase>
+
+        <testCase id="040602">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
+		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+        </testCase>
+
+        <testCase id="040603">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(unbalanced)</desc>
+		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>unbalanced</iperf_profile>
+        </testCase>
+
 	<testCase id="040611">
                 <class>Iperf</class>
                 <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
@@ -92,6 +145,30 @@
 		<iperf_profile>unbalanced</iperf_profile>
 	</testCase>
 
+	<testCase id="040641">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
+		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+	<testCase id="040642">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
+		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="040643">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
+		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>unbalanced</iperf_profile>
+	</testCase>
+
 	<testCase id="040651">
 		<class>Iperf</class>
 		<desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
@@ -116,4 +193,34 @@
 		<iperf_profile>unbalanced</iperf_profile>
 	</testCase>
 
+        <testCase id="050101">
+		<class>Initialize_HSS</class>
+		<desc>Initialize HSS</desc>
+        </testCase>
+
+	<testCase id="060101">
+		<class>Initialize_MME</class>
+		<desc>Initialize MME</desc>
+	</testCase>
+
+	<testCase id="070101">
+		<class>Initialize_SPGW</class>
+		<desc>Initialize SPGW</desc>
+	</testCase>
+
+        <testCase id="050201">
+                <class>Terminate_HSS</class>
+                <desc>Terminate HSS</desc>
+        </testCase>
+
+        <testCase id="060201">
+                <class>Terminate_MME</class>
+                <desc>Terminate MME</desc>
+        </testCase>
+
+        <testCase id="070201">
+                <class>Terminate_SPGW</class>
+                <desc>Terminate SPGW</desc>
+        </testCase>
+
 </testCaseList>

ci-scripts/xml_files/if4p5_usrp210_band40.xml

@@ -0,0 +1,219 @@
+<!--
+
+ 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.1  (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
+
+-->
+<testCaseList>
+	<!-- Only 5MHz is tested since neither 10MHz nor 20MHz work in this configuration -->
+	<!-- Also no UL iperf in 5MHz (040642) -->
+        <TestCaseRequestedList>
+ 010101
+ 050101 060101 070101 040101
+ 030104 030105 040301 040501 040602 040401 040201 030201 030202
+ 050201 060201 070201
+	</TestCaseRequestedList>
+	<!--
+ 030104 030105 040301 040501 040602 040642 040401 040201 030201 030202
+ 030114 030115 040301 040511 040612 040652 040401 040201 030201 030202
+ 030124 030125 040301 040521 040622 040662 040401 040201 030201 030202
+	-->
+	<TestCaseExclusionList>
+	</TestCaseExclusionList>
+
+	<testCase id="010101">
+		<class>Build_eNB</class>
+		<desc>Build eNB (USRP -- Ethernet Fronthaul)</desc>
+		<Build_eNB_args>-t ETHERNET -w USRP -c --eNB</Build_eNB_args>
+	</testCase>
+
+	<testCase id="030104">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RRU (TDD/Band40)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.tdd.band40.conf</Initialize_eNB_args>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+	
+	<testCase id="030105">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RCC (TDD/Band40/5MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
+		<eNB_instance>1</eNB_instance>
+	</testCase>
+	
+	<testCase id="030114">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RRU (TDD/Band40)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.tdd.band40.conf</Initialize_eNB_args>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+	
+	<testCase id="030115">
+                <class>Initialize_eNB</class>
+                <desc>Initialize RCC (TDD/Band40/10MHz/info)</desc>
+                <Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
+		<eNB_instance>1</eNB_instance>
+        </testCase>
+
+	<testCase id="030124">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RRU (TDD/Band40)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.tdd.band40.conf</Initialize_eNB_args>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+	
+	<testCase id="030125">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RCC (TDD/Band40/20MHz/info)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
+		<eNB_instance>1</eNB_instance>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate RCC</desc>
+		<eNB_instance>1</eNB_instance>
+	</testCase>
+
+	<testCase id="030202">
+		<class>Terminate_eNB</class>
+		<desc>Terminate RRU</desc>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+
+	<testCase id="040101">
+		<class>Initialize_UE</class>
+		<desc>Initialize UE</desc>
+	</testCase>
+
+	<testCase id="040201">
+		<class>Terminate_UE</class>
+		<desc>Terminate UE</desc>
+	</testCase>
+
+        <testCase id="040301">
+                <class>Attach_UE</class>
+                <desc>Attach UE</desc>
+        </testCase>
+
+        <testCase id="040401">
+                <class>Detach_UE</class>
+                <desc>Detach UE</desc>
+        </testCase>
+
+        <testCase id="040501">
+                <class>Ping</class>
+                <desc>ping (5MHz - 20 sec)</desc>
+                <ping_args>-c 20</ping_args>
+                <ping_packetloss_threshold>25</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="040511">
+                <class>Ping</class>
+                <desc>ping (10MHz - 20 sec)</desc>
+                <ping_args>-c 20</ping_args>
+                <ping_packetloss_threshold>25</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="040521">
+                <class>Ping</class>
+                <desc>ping (20MHz - 20 sec)</desc>
+                <ping_args>-c 20</ping_args>
+                <ping_packetloss_threshold>25</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="040602">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
+		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+        </testCase>
+
+        <testCase id="040612">
+                <class>Iperf</class>
+                <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
+                <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
+                <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+                <iperf_profile>single-ue</iperf_profile>
+        </testCase>
+
+        <testCase id="040622">
+                <class>Iperf</class>
+                <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
+                <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
+                <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+                <iperf_profile>single-ue</iperf_profile>
+        </testCase>
+
+	<testCase id="040642">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
+		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="040652">
+		<class>Iperf</class>
+		<desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
+		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="040662">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
+		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+        <testCase id="050101">
+		<class>Initialize_HSS</class>
+		<desc>Initialize HSS</desc>
+        </testCase>
+
+	<testCase id="060101">
+		<class>Initialize_MME</class>
+		<desc>Initialize MME</desc>
+	</testCase>
+
+	<testCase id="070101">
+		<class>Initialize_SPGW</class>
+		<desc>Initialize SPGW</desc>
+	</testCase>
+
+        <testCase id="050201">
+                <class>Terminate_HSS</class>
+                <desc>Terminate HSS</desc>
+        </testCase>
+
+        <testCase id="060201">
+                <class>Terminate_MME</class>
+                <desc>Terminate MME</desc>
+        </testCase>
+
+        <testCase id="070201">
+                <class>Terminate_SPGW</class>
+                <desc>Terminate SPGW</desc>
+        </testCase>
+
+</testCaseList>

ci-scripts/xml_files/if4p5_usrp210_band40_build.xml

@@ -1,55 +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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>build-tab</htmlTabRef>
-	<htmlTabName>Build</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 010101
- 050101 060101 070101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="010101">
-		<class>Build_eNB</class>
-		<desc>Build eNB (USRP -- Ethernet Fronthaul)</desc>
-		<Build_eNB_args>-t ETHERNET -w USRP -c --eNB</Build_eNB_args>
-	</testCase>
-
-        <testCase id="050101">
-		<class>Initialize_HSS</class>
-		<desc>Initialize HSS</desc>
-        </testCase>
-
-	<testCase id="060101">
-		<class>Initialize_MME</class>
-		<desc>Initialize MME</desc>
-	</testCase>
-
-	<testCase id="070101">
-		<class>Initialize_SPGW</class>
-		<desc>Initialize SPGW</desc>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/if4p5_usrp210_band40_epc_closure.xml

@@ -1,48 +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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>epc-closure</htmlTabRef>
-	<htmlTabName>EPC-Closure</htmlTabName>
-	<htmlTabIcon>log-out</htmlTabIcon>
-        <TestCaseRequestedList>
- 050201 060201 070201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-        <testCase id="050201">
-                <class>Terminate_HSS</class>
-                <desc>Terminate HSS</desc>
-        </testCase>
-
-        <testCase id="060201">
-                <class>Terminate_MME</class>
-                <desc>Terminate MME</desc>
-        </testCase>
-
-        <testCase id="070201">
-                <class>Terminate_SPGW</class>
-                <desc>Terminate SPGW</desc>
-        </testCase>
-
-</testCaseList>

ci-scripts/xml_files/if4p5_usrp210_band40_test_05mhz.xml

@@ -1,103 +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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>test-05</htmlTabRef>
-	<htmlTabName>Test-05MHz</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
- 040101
- 030104 030105 040301 040501 040602 040642 040401 040201 030201 030202
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="030104">
-		<class>Initialize_eNB</class>
-		<desc>Initialize RRU (TDD/Band40)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.tdd.band40.conf</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-	
-	<testCase id="030105">
-		<class>Initialize_eNB</class>
-		<desc>Initialize RCC (TDD/Band40/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-	
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate RCC</desc>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="030202">
-		<class>Terminate_eNB</class>
-		<desc>Terminate RRU</desc>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
-
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
-
-        <testCase id="040501">
-                <class>Ping</class>
-                <desc>ping (5MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>25</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="040602">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
-		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
-
-	<testCase id="040642">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/if4p5_usrp210_band40_test_10mhz.xml

@@ -1,103 +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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>test-10</htmlTabRef>
-	<htmlTabName>Test-10MHz</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
- 040101
- 030114 030115 040301 040511 040612 040652 040401 040201 030201 030202
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="030114">
-		<class>Initialize_eNB</class>
-		<desc>Initialize RRU (TDD/Band40)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.tdd.band40.conf</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-	
-	<testCase id="030115">
-                <class>Initialize_eNB</class>
-                <desc>Initialize RCC (TDD/Band40/10MHz/info)</desc>
-                <Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
-		<eNB_instance>1</eNB_instance>
-        </testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate RCC</desc>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="030202">
-		<class>Terminate_eNB</class>
-		<desc>Terminate RRU</desc>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
-
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
-
-        <testCase id="040511">
-                <class>Ping</class>
-                <desc>ping (10MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>25</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="040612">
-                <class>Iperf</class>
-                <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
-                <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
-                <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-                <iperf_profile>single-ue</iperf_profile>
-        </testCase>
-
-	<testCase id="040652">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/if4p5_usrp210_band40_test_20mhz.xml

@@ -1,103 +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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>test-20</htmlTabRef>
-	<htmlTabName>Test-20MHz</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
- 040101
- 030124 030125 040301 040521 040622 040662 040401 040201 030201 030202
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="030124">
-		<class>Initialize_eNB</class>
-		<desc>Initialize RRU (TDD/Band40)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.tdd.band40.conf</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-	
-	<testCase id="030125">
-		<class>Initialize_eNB</class>
-		<desc>Initialize RCC (TDD/Band40/20MHz/info)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate RCC</desc>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="030202">
-		<class>Terminate_eNB</class>
-		<desc>Terminate RRU</desc>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
-
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
-
-        <testCase id="040521">
-                <class>Ping</class>
-                <desc>ping (20MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>25</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="040622">
-                <class>Iperf</class>
-                <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
-                <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
-                <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-                <iperf_profile>single-ue</iperf_profile>
-        </testCase>
-
-	<testCase id="040662">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/if4p5_usrp210_band7.xml

@@ -0,0 +1,217 @@
+<!--
+
+ 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.1  (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
+
+-->
+<testCaseList>
+	<!-- Only 5MHz is tested since neither 10MHz nor 20MHz work in this configuration -->
+	<TestCaseRequestedList>
+ 010101
+ 050101 060101 070101 040101
+ 030101 030102 040301 040501 040604 040642 040401 040201 030201 030202
+ 050201 060201 070201
+	</TestCaseRequestedList>
+	<!--
+ 030111 030112 040301 040511 040614 040652 040401 040201 030201 030202
+ 030121 030122 040301 040521 040624 040662 040401 040201 030201 030202
+	-->
+	<TestCaseExclusionList>
+	</TestCaseExclusionList>
+
+	<testCase id="010101">
+		<class>Build_eNB</class>
+		<desc>Build eNB (USRP -- Ethernet Fronthaul)</desc>
+		<Build_eNB_args>-t ETHERNET -w USRP -c --eNB</Build_eNB_args>
+	</testCase>
+
+	<testCase id="030101">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RRU (FDD/Band7)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.fdd.band7.conf</Initialize_eNB_args>
+		<eNB_instance>1</eNB_instance>
+	</testCase>
+
+	<testCase id="030102">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RCC (FDD/Band7/5MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf</Initialize_eNB_args>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+
+	<testCase id="030111">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RRU (FDD/Band7)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.fdd.band7.conf</Initialize_eNB_args>
+		<eNB_instance>1</eNB_instance>
+	</testCase>
+
+	<testCase id="030112">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RCC (FDD/Band7/10MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf</Initialize_eNB_args>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+
+	<testCase id="030121">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RRU (FDD/Band7)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.fdd.band7.conf</Initialize_eNB_args>
+		<eNB_instance>1</eNB_instance>
+	</testCase>
+
+	<testCase id="030122">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RCC (FDD/Band7/20MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf</Initialize_eNB_args>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate RCC</desc>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+
+	<testCase id="030202">
+		<class>Terminate_eNB</class>
+		<desc>Terminate RRU</desc>
+		<eNB_instance>1</eNB_instance>
+	</testCase>
+
+	<testCase id="040101">
+		<class>Initialize_UE</class>
+		<desc>Initialize UE</desc>
+	</testCase>
+
+	<testCase id="040201">
+		<class>Terminate_UE</class>
+		<desc>Terminate UE</desc>
+	</testCase>
+
+        <testCase id="040301">
+                <class>Attach_UE</class>
+                <desc>Attach UE</desc>
+        </testCase>
+
+        <testCase id="040401">
+                <class>Detach_UE</class>
+                <desc>Detach UE</desc>
+        </testCase>
+
+        <testCase id="040501">
+                <class>Ping</class>
+                <desc>ping (5MHz - 20 sec)</desc>
+                <ping_args>-c 20</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="040604">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+        </testCase>
+
+	<testCase id="040642">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+        <testCase id="040511">
+                <class>Ping</class>
+                <desc>ping (10MHz - 20 sec)</desc>
+                <ping_args>-c 20</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="040614">
+		<class>Iperf</class>
+		<desc>iperf (10MHz - DL/32Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 32M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+        </testCase>
+
+	<testCase id="040652">
+		<class>Iperf</class>
+		<desc>iperf (10MHz - UL/20Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+        <testCase id="040521">
+                <class>Ping</class>
+                <desc>ping (20MHz - 20 sec)</desc>
+                <ping_args>-c 20</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="040624">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+        </testCase>
+
+	<testCase id="040662">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - UL/20Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+        <testCase id="050101">
+		<class>Initialize_HSS</class>
+		<desc>Initialize HSS</desc>
+        </testCase>
+
+	<testCase id="060101">
+		<class>Initialize_MME</class>
+		<desc>Initialize MME</desc>
+	</testCase>
+
+	<testCase id="070101">
+		<class>Initialize_SPGW</class>
+		<desc>Initialize SPGW</desc>
+	</testCase>
+
+	<testCase id="050201">
+		<class>Terminate_HSS</class>
+		<desc>Terminate HSS</desc>
+	</testCase>
+
+	<testCase id="060201">
+		<class>Terminate_MME</class>
+		<desc>Terminate MME</desc>
+	</testCase>
+
+	<testCase id="070201">
+		<class>Terminate_SPGW</class>
+		<desc>Terminate SPGW</desc>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/if4p5_usrp210_band7_build.xml

@@ -1,55 +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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>build-tab</htmlTabRef>
-	<htmlTabName>Build</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 010101
- 050101 060101 070101 040101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="010101">
-		<class>Build_eNB</class>
-		<desc>Build eNB (USRP -- Ethernet Fronthaul)</desc>
-		<Build_eNB_args>-t ETHERNET -w USRP -c --eNB</Build_eNB_args>
-	</testCase>
-
-        <testCase id="050101">
-		<class>Initialize_HSS</class>
-		<desc>Initialize HSS</desc>
-        </testCase>
-
-	<testCase id="060101">
-		<class>Initialize_MME</class>
-		<desc>Initialize MME</desc>
-	</testCase>
-
-	<testCase id="070101">
-		<class>Initialize_SPGW</class>
-		<desc>Initialize SPGW</desc>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/if4p5_usrp210_band7_epc_closure.xml

@@ -1,48 +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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>epc-closure</htmlTabRef>
-	<htmlTabName>EPC-Closure</htmlTabName>
-	<htmlTabIcon>log-out</htmlTabIcon>
-	<TestCaseRequestedList>
- 050201 060201 070201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="050201">
-		<class>Terminate_HSS</class>
-		<desc>Terminate HSS</desc>
-	</testCase>
-
-	<testCase id="060201">
-		<class>Terminate_MME</class>
-		<desc>Terminate MME</desc>
-	</testCase>
-
-	<testCase id="070201">
-		<class>Terminate_SPGW</class>
-		<desc>Terminate SPGW</desc>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/if4p5_usrp210_band7_test_05mhz.xml

@@ -1,103 +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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>test-05</htmlTabRef>
-	<htmlTabName>Test-05MHz</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<TestCaseRequestedList>
- 040101
- 030101 030102 040301 040501 040604 040642 040401 040201 030201 030202
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="030101">
-		<class>Initialize_eNB</class>
-		<desc>Initialize RRU (FDD/Band7)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.fdd.band7.conf</Initialize_eNB_args>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="030102">
-		<class>Initialize_eNB</class>
-		<desc>Initialize RCC (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate RCC</desc>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="030202">
-		<class>Terminate_eNB</class>
-		<desc>Terminate RRU</desc>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
-
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
-
-        <testCase id="040501">
-                <class>Ping</class>
-                <desc>ping (5MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="040604">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
-
-	<testCase id="040642">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/if4p5_usrp210_band7_test_10mhz.xml

@@ -1,103 +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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>test-10</htmlTabRef>
-	<htmlTabName>Test-10MHz</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<TestCaseRequestedList>
- 040101
- 030111 030112 040301 040511 040614 040652 040401 040201 030201 030202
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="030111">
-		<class>Initialize_eNB</class>
-		<desc>Initialize RRU (FDD/Band7)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.fdd.band7.conf</Initialize_eNB_args>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="030112">
-		<class>Initialize_eNB</class>
-		<desc>Initialize RCC (FDD/Band7/10MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate RCC</desc>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="030202">
-		<class>Terminate_eNB</class>
-		<desc>Terminate RRU</desc>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
-
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
-
-        <testCase id="040511">
-                <class>Ping</class>
-                <desc>ping (10MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="040614">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - DL/32Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 32M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
-
-	<testCase id="040652">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - UL/5Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 5M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>60</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/if4p5_usrp210_band7_test_20mhz.xml

@@ -1,103 +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.1  (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
-
--->
-<testCaseList>
-	<htmlTabRef>test-20</htmlTabRef>
-	<htmlTabName>Test-20MHz</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<TestCaseRequestedList>
- 040101
- 030121 030122 040301 040521 040624 040662 040401 040201 030201 030202
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="030121">
-		<class>Initialize_eNB</class>
-		<desc>Initialize RRU (FDD/Band7)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.fdd.band7.conf</Initialize_eNB_args>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="030122">
-		<class>Initialize_eNB</class>
-		<desc>Initialize RCC (FDD/Band7/20MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate RCC</desc>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="030202">
-		<class>Terminate_eNB</class>
-		<desc>Terminate RRU</desc>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
-
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
-
-        <testCase id="040521">
-                <class>Ping</class>
-                <desc>ping (20MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="040624">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/50Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 50M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
-
-	<testCase id="040662">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/10Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 10M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/test_case_list_template.xml

@@ -107,28 +107,6 @@
 		<desc>Reboot UE</desc>
 	</testCase>
 
-	<!-- CAT-M UE class command references -->
-
-	<testCase id="040102">
-		<class>Initialize_CatM_module</class>
-		<desc>Initialize CAT-M Module</desc>
-	</testCase>
-
-	<testCase id="040202">
-		<class>Terminate_CatM_module</class>
-		<desc>Terminate CAT-M Module</desc>
-	</testCase>
-
-	<testCase id="040302">
-		<class>Attach_CatM_module</class>
-		<desc>Attach CAT-M Module</desc>
-	</testCase>
-
-	<testCase id="040402">
-		<class>Detach_CatM_module</class>
-		<desc>Detach CAT-M Module</desc>
-	</testCase>
-
 	<!-- EPC class command references -->
 
         <testCase id="050101">

cmake_targets/CMakeLists.txt

@@ -183,6 +183,7 @@ set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath -Wl,${CMAKE_CU
 #########################
 # set a flag for changes in the source code
 # these changes are related to hardcoded path to include .h files
+add_definitions(-DCMAKER)
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -g -DMALLOC_CHECK_=3")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS} -g -DMALLOC_CHECK_=3 -O2")
 
@@ -231,7 +232,7 @@ add_definitions("-DPACKAGE_BUGREPORT=\"openair4g-devel@lists.eurecom.fr\"")
 # Debug related options
 #########################################
 add_boolean_option(ASN_DEBUG           False "ASN1 coder/decoder Debug")
-add_boolean_option(ASN_EMIT_DEBUG      False "ASN1 coder/decoder Debug")
+add_boolean_option(EMIT_ASN_DEBUG      False "ASN1 coder/decoder Debug")
 add_boolean_option(MSG_PRINT           False "print debug messages")
 add_boolean_option(DISABLE_XER_PRINT   False "print XER Format")
 add_boolean_option(XER_PRINT           False "print XER Format")
@@ -259,17 +260,17 @@ add_boolean_option(ENABLE_ITTI True "ITTI is internal messaging, should remain e
 set (OCP_ITTI ${OPENAIR_DIR}/common/utils/ocp_itti)
 if (${ENABLE_ITTI})
   add_library(ITTI
+    # add .h files if depend on (this one is generated)
     ${OCP_ITTI}/intertask_interface.cpp
     ${OPENAIR_DIR}/common/utils/backtrace.c
     ${OPENAIR_DIR}/common/utils/memory_pools.c
     )
-add_dependencies(ITTI rrc_flag)
   set(ITTI_LIB ITTI)
   set(GTPU_need_ITTI ${OPENAIR3_DIR}/GTPV1-U/gtpv1u_eNB.c)
 endif (${ENABLE_ITTI})
 
 #############################
-# ASN.1 grammar C code generation & dependencies
+# ASN.1 grammar C code generation & dependancies
 ################################
 # A difficulty: asn1c generates C code of a un-predictable list of files
 # so, generate the c from asn1c once at cmake run time
@@ -277,6 +278,8 @@ endif (${ENABLE_ITTI})
 # (so creating new asn.1 objects instead of modifying the object attributes)
 # New C code source file, cmake must be re-run (instead of re-running make only)
 #############
+# set(asn1c_call "${OPENAIR_CMAKE}/tools/generate_asn1")
+# set(fix_asn1c_call "${OPENAIR_CMAKE}/tools/fix_asn1")
 set(asn1_generated_dir ${OPENAIR_BIN_DIR})
 
 set(protoc_call "${OPENAIR_CMAKE}/tools/generate_protobuf")
@@ -314,27 +317,32 @@ elseif (${RRC_ASN1_VERSION} STREQUAL "Rel15")
 endif  (${RRC_ASN1_VERSION} STREQUAL "Rel8")
 add_definitions(-DLTE_RRC_VERSION=${LTE_RRC_VERSION})
 set (RRC_FULL_DIR ${asn1_generated_dir}/RRC_${RRC_ASN1_VERSION})
-
-# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
-execute_process(COMMAND ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${RRC_FULL_DIR}" "${RRC_GRAMMAR}" "LTE_"
+message("calling ASN1C_PREFIX=LTE_ asn1c -pdu=all -fcompound-names -gen-PER -no-gen-OER -no-gen-example -D ${RRC_FULL_DIR} ${RRC_GRAMMAR}")
+execute_process(COMMAND mkdir -p ${RRC_FULL_DIR}
+                COMMAND env "ASN1C_PREFIX=LTE_" asn1c -pdu=all -fcompound-names -gen-PER -no-gen-OER -no-gen-example -D ${RRC_FULL_DIR} ${RRC_GRAMMAR}
                 RESULT_VARIABLE ret)
 if (NOT ${ret} STREQUAL 0)
   message(FATAL_ERROR "${ret}: error")
 endif (NOT ${ret} STREQUAL 0)
-file(GLOB rrc_source ${RRC_FULL_DIR}/*.c)
-add_custom_target (
-  rrc_flag ALL
-  ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${RRC_FULL_DIR}" "${RRC_GRAMMAR}" "LTE_"
-  DEPENDS ${RRC_GRAMMAR}
-  )
 
+file(GLOB rrc_source ${RRC_FULL_DIR}/*.c)
+file(GLOB rrc_h ${RRC_FULL_DIR}/*.h)
+set(rrc_h ${rrc_h} ${RRC_FULL_DIR}/asn_constant.h)
 set_source_files_properties(${rrc_source} PROPERTIES COMPILE_FLAGS -w) # suppress warnings from generated code
-add_library(RRC_LIB ${rrc_source}
+add_library(RRC_LIB ${rrc_h} ${rrc_source}
     ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1_msg.c
     ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c)
-add_dependencies(RRC_LIB rrc_flag)
 include_directories ("${RRC_FULL_DIR}")
 
+# add the command to generate the source code
+# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
+add_custom_command (
+  OUTPUT ${RRC_FULL_DIR}/asn_constant.h
+  COMMAND mkdir -p ${RRC_FULL_DIR}
+  COMMAND env "ASN1C_PREFIX=LTE_" asn1c -pdu=all -fcompound-names -gen-PER -no-gen-OER -no-gen-example -D ${RRC_FULL_DIR} ${RRC_GRAMMAR}
+  DEPENDS ${RRC_GRAMMAR}
+  )
+
 # S1AP
 # Same limitation as described in RRC: unknown generated file list
 # so we generate it at cmake time
@@ -370,26 +378,28 @@ endif(${S1AP_RELEASE} STREQUAL "R8")
 add_definitions(-DS1AP_VERSION=${S1AP_VERSION})
 set(S1AP_ASN_DIR ${S1AP_DIR}/MESSAGES/ASN1/${S1AP_RELEASE})
 set(S1AP_C_DIR ${asn1_generated_dir}/S1AP_${S1AP_RELEASE})
-
-# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
-execute_process(COMMAND ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${S1AP_C_DIR}" "${S1AP_ASN_DIR}/${S1AP_ASN_FILES}" "S1AP_" -fno-include-deps
+message("calling ASN1C_PREFIX=S1AP_ asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${S1AP_C_DIR} ${S1AP_ASN_DIR}/${S1AP_ASN_FILES}")
+execute_process(COMMAND mkdir -p ${S1AP_C_DIR}
+                COMMAND env "ASN1C_PREFIX=S1AP_" asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${S1AP_C_DIR} ${S1AP_ASN_DIR}/${S1AP_ASN_FILES}
                 RESULT_VARIABLE ret)
 if (NOT ${ret} STREQUAL 0)
   message(FATAL_ERROR "${ret}: error")
 endif (NOT ${ret} STREQUAL 0)
 file(GLOB S1AP_source ${S1AP_C_DIR}/*.c)
 
-add_custom_target (
-  s1ap_flag ALL
-  ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${S1AP_C_DIR}" "${S1AP_ASN_DIR}/${S1AP_ASN_FILES}" "S1AP_" -fno-include-deps
-  DEPENDS  "${S1AP_ASN_DIR}/${S1AP_ASN_FILES}" 
-)
+file(GLOB s1ap_h ${S1AP_C_DIR}/*.h)
+set(s1ap_h ${s1ap_h})
 
+add_custom_command (
+  OUTPUT ${S1AP_C_DIR}/S1AP_asn_constant.h
+  COMMAND mkdir -p ${S1AP_C_DIR}
+  COMMAND env "ASN1C_PREFIX=S1AP_" asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${S1AP_C_DIR} ${S1AP_ASN_DIR}/${S1AP_ASN_FILES}
+  DEPENDS ${S1AP_ASN_DIR}/${S1AP_ASN_FILES}
+)
 add_library(S1AP_LIB
   ${S1AP_source}
   ${S1AP_DIR}/s1ap_common.c
   )
-add_dependencies(S1AP_LIB rrc_flag s1ap_flag)
 
 include_directories ("${S1AP_C_DIR}")
 include_directories ("${S1AP_DIR}")
@@ -408,7 +418,6 @@ add_library(S1AP_ENB
   ${S1AP_DIR}/s1ap_eNB_trace.c
   ${S1AP_DIR}/s1ap_eNB_ue_context.c
   )
-add_dependencies(S1AP_ENB rrc_flag s1ap_flag)
 
 #X2AP
 # Same limitation as described in RRC/S1AP: unknown generated file list
@@ -436,19 +445,22 @@ endif(${X2AP_RELEASE} STREQUAL "R8")
 add_definitions(-DX2AP_VERSION=${X2AP_VERSION})
 set(X2AP_ASN_DIR ${X2AP_DIR}/MESSAGES/ASN1/${X2AP_RELEASE})
 set(X2AP_C_DIR ${asn1_generated_dir}/X2AP_${X2AP_RELEASE})
-
-# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
-execute_process(COMMAND ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${X2AP_C_DIR}" "${X2AP_ASN_DIR}/${X2AP_ASN_FILES}"  "X2AP_" -fno-include-deps
+message("calling ASN1C_PREFIX=X2AP_ asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${X2AP_C_DIR} ${X2AP_ASN_DIR}/${X2AP_ASN_FILES}")
+execute_process(COMMAND mkdir -p ${X2AP_C_DIR}
+                COMMAND env "ASN1C_PREFIX=X2AP_" asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${X2AP_C_DIR} ${X2AP_ASN_DIR}/${X2AP_ASN_FILES}
                 RESULT_VARIABLE ret)
 if (NOT ${ret} STREQUAL 0)
   message(FATAL_ERROR "${ret}: error")
 endif (NOT ${ret} STREQUAL 0)
-
 file(GLOB X2AP_source ${X2AP_C_DIR}/*.c)
 
-add_custom_target (
-  x2_flag ALL
-  COMMAND ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${X2AP_C_DIR}" "${X2AP_ASN_DIR}/${X2AP_ASN_FILES}"  "X2AP_" -fno-include-deps
+file(GLOB x2ap_h ${X2AP_C_DIR}/*.h)
+set(x2ap_h ${x2ap_h})
+
+add_custom_command (
+  OUTPUT ${X2AP_C_DIR}/X2AP_asn_constant.h
+  COMMAND mkdir -p ${X2AP_C_DIR}
+  COMMAND env "ASN1C_PREFIX=X2AP_" asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${X2AP_C_DIR} ${X2AP_ASN_DIR}/${X2AP_ASN_FILES}
   DEPENDS ${X2AP_ASN_DIR}/${X2AP_ASN_FILES}
   )
 
@@ -456,7 +468,6 @@ add_library(X2AP_LIB
   ${X2AP_source}
   ${X2AP_DIR}/x2ap_common.c
   )
-add_dependencies(X2AP_LIB rrc_flag x2_flag)
 
 include_directories ("${X2AP_C_DIR}")
 include_directories ("${X2AP_DIR}")
@@ -470,7 +481,6 @@ add_library(X2AP_ENB
   ${X2AP_DIR}/x2ap_eNB_management_procedures.c
   ${X2AP_DIR}/x2ap_eNB_generate_messages.c
  )
-add_dependencies(X2AP_ENB rrc_flag x2_flag)
 
 # Hardware dependant options
 ###################################
@@ -547,7 +557,7 @@ set(HWLIB_IRIS_SOURCE
         ${OPENAIR_TARGETS}/ARCH/IRIS/USERSPACE/LIB/iris_lib.cpp
         )
 add_library(oai_irisdevif MODULE ${HWLIB_IRIS_SOURCE})
-target_include_directories(oai_irisdevif PRIVATE /usr/local/lib/SoapySDR/modules0.7/)
+target_include_directories(oai_irisdevif PRIVATE /usr/local/lib/SoapySDR/modules0.6/)
 target_link_libraries(oai_irisdevif SoapySDR)
 
 include_directories("${OPENAIR_TARGETS}/ARCH/mobipass/")
@@ -615,7 +625,6 @@ add_boolean_option(MESSAGE_CHART_GENERATOR_PHY     False "trace some PHY exchang
 add_boolean_option(UE_EXPANSION             False         "enable UE_EXPANSION with max 256 UE")
 add_boolean_option(PHY_TX_THREAD            False         "enable UE_EXPANSION with max 256 UE")
 add_boolean_option(PRE_SCD_THREAD           False         "enable UE_EXPANSION with max 256 UE")
-add_boolean_option(UESIM_EXPANSION          False         "enable UESIM_EXPANSION with max 256 UE")
 
 ########################
 # Include order
@@ -630,6 +639,7 @@ add_boolean_option(ENABLE_VCD              True  "always true now, time measurem
 add_boolean_option(ENABLE_VCD_FIFO         True  "time measurements of proc calls and var displays sent to FIFO (one more thread)")
 add_boolean_option(LINUX                   False "used in weird memcpy() in pdcp.c ???")
 add_boolean_option(LINUX_LIST              False "used only in lists.c: either use OAI implementation of lists or Linux one (should be True, but it is False")
+add_boolean_option(LOG_NO_THREAD           True  "Disable thread for log, seems always set to true")
 add_boolean_option(OPENAIR_LTE             True "Seems legacy: keep it to true")
 
 ##########################
@@ -872,7 +882,6 @@ add_library(FLEXRAN_AGENT
   ${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c
   ${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_slice_verification.c
   )
-add_dependencies(FLEXRAN_AGENT rrc_flag)
 set(FLEXRAN_AGENT_LIB FLEXRAN_AGENT)
 #include_directories(${OPENAIR2_DIR}/ENB_APP)
 
@@ -938,7 +947,6 @@ set(UTIL_SRC
 #  ${OPENAIR2_DIR}/UTIL/OTG/otg_rx.c
   )
 add_library(UTIL ${UTIL_SRC})
-add_dependencies(UTIL rrc_flag)
 
 #set(OMG_SUMO_SRC
 #  ${OPENAIR2_DIR}/UTIL/OMG/client_traci_OMG.c
@@ -978,14 +986,12 @@ set(SCHED_SRC
   ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_common.c
 )
 add_library(SCHED_LIB ${SCHED_SRC})
-add_dependencies(SCHED_LIB rrc_flag)
 
 set(SCHED_SRC_RU
   ${OPENAIR1_DIR}/SCHED/ru_procedures.c
   ${OPENAIR1_DIR}/SCHED/prach_procedures.c
 )
 add_library(SCHED_RU_LIB ${SCHED_SRC_RU})
-add_dependencies(SCHED_RU_LIB rrc_flag)
 
 set(SCHED_SRC_UE
   ${OPENAIR1_DIR}/SCHED_UE/phy_procedures_lte_ue.c
@@ -995,7 +1001,6 @@ set(SCHED_SRC_UE
   ${OPENAIR1_DIR}/SCHED_UE/srs_pc.c
 )
 add_library(SCHED_UE_LIB ${SCHED_SRC_UE})
-add_dependencies(SCHED_UE_LIB rrc_flag)
 
 # nFAPI
 #################################
@@ -1047,7 +1052,6 @@ set(NFAPI_USER_SRC
   ${NFAPI_USER_DIR}/nfapi_vnf.c
 )
 add_library(NFAPI_USER_LIB ${NFAPI_USER_SRC})
-add_dependencies(NFAPI_USER_LIB rrc_flag)
 include_directories(${NFAPI_USER_DIR})
 
 # Layer 1
@@ -1066,6 +1070,9 @@ set(PHY_TURBOIF
 
 add_library(coding MODULE ${PHY_TURBOSRC} )
 set(PHY_SRC_COMMON
+  # depend on code generation from asn1c
+  ${RRC_FULL_DIR}/asn_constant.h
+  # actual source
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools_common.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/lte_mcs.c
 #  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/slss.c
@@ -1116,6 +1123,7 @@ set(PHY_SRC_COMMON
   )
 
 set(PHY_SRC
+  # actual source
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pss.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sss.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sss_gen.c
@@ -1143,6 +1151,7 @@ set(PHY_SRC
   )
 
 set(PHY_SRC_RU
+  # actual source
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/if4_tools.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/if5_tools.c
   ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_ul.c
@@ -1156,6 +1165,7 @@ set(PHY_SRC_RU
   )
 
 set(PHY_SRC_UE
+  # actual source
   ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/sss_ue.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sss_gen.c
   ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
@@ -1204,13 +1214,9 @@ if (${COMPILATION_AVX2} STREQUAL "True")
 endif ()
 
 add_library(PHY_COMMON ${PHY_SRC_COMMON})
-add_dependencies(PHY_COMMON rrc_flag)
 add_library(PHY ${PHY_SRC})
-add_dependencies(PHY rrc_flag)
 add_library(PHY_UE ${PHY_SRC_UE})
-add_dependencies(PHY_UE rrc_flag)
 add_library(PHY_RU ${PHY_SRC_RU})
-add_dependencies(PHY_RU rrc_flag)
 
 #Library for mex functions
 #########################3
@@ -1380,13 +1386,11 @@ add_library(L2
   ${MAC_SRC}
   ${ENB_APP_SRC})
 #  ${OPENAIR2_DIR}/RRC/L2_INTERFACE/openair_rrc_L2_interface.c)
-add_dependencies(L2 rrc_flag s1ap_flag x2_flag)
 
 add_library(L2_UE
   ${L2_SRC_UE}
   ${MAC_SRC_UE}
 )
-add_dependencies(L2_UE rrc_flag s1ap_flag x2_flag)
 
 include_directories(${NFAPI_USER_DIR})
 
@@ -1412,7 +1416,6 @@ set (GTPV1U_SRC
   ${GTPV1U_DIR}/gtpv1u_teid_pool.c
 )
 add_library(GTPV1U ${GTPV1U_SRC})
-add_dependencies(GTPV1U rrc_flag)
 
 set(SCTP_SRC
   ${OPENAIR3_DIR}/SCTP/sctp_common.c
@@ -1420,10 +1423,8 @@ set(SCTP_SRC
   ${OPENAIR3_DIR}/SCTP/sctp_eNB_itti_messaging.c
 )
 add_library(SCTP_CLIENT ${SCTP_SRC})
-add_dependencies(SCTP_CLIENT rrc_flag)
 
 add_library(UDP ${OPENAIR3_DIR}/UDP/udp_eNB_task.c)
-add_dependencies(UDP rrc_flag)
 
 
 set(NAS_SRC ${OPENAIR3_DIR}/NAS/)
@@ -1672,7 +1673,6 @@ if(NAS_UE)
     ${libnas_ue_esm_OBJS}
     ${libnas_ue_esm_sap_OBJS}
   )
-  add_dependencies(LIB_NAS_UE rrc_flag)
   set(NAS_UE_LIB LIB_NAS_UE)
 
   include_directories(${NAS_SRC}UE)
@@ -1939,11 +1939,12 @@ add_definitions(-DASN1_MINIMUM_VERSION=924)
 ###################################################
 
 add_executable(lte-softmodem
+  ${rrc_h}
+  ${s1ap_h}
   ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
   ${OPENAIR_TARGETS}/RT/USER/lte-enb.c
   ${OPENAIR_TARGETS}/RT/USER/lte-ru.c
   ${OPENAIR_TARGETS}/RT/USER/lte-softmodem.c
-  ${OPENAIR_TARGETS}/RT/USER/lte-softmodem-common.c
   ${OPENAIR2_DIR}/ENB_APP/NB_IoT_interface.c
   ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
   ${OPENAIR_TARGETS}/COMMON/create_tasks.c
@@ -1961,7 +1962,6 @@ add_executable(lte-softmodem
   ${CONFIG_SOURCES}
   ${SHLIB_LOADER_SOURCES}
   )
-add_dependencies(lte-softmodem rrc_flag s1ap_flag x2_flag)
 
 target_link_libraries (lte-softmodem
   -Wl,--start-group
@@ -1978,11 +1978,12 @@ target_link_libraries (lte-softmodem ${T_LIB})
 # lte-softmodem-nos1 is both eNB and UE implementation
 ###################################################
 add_executable(lte-softmodem-nos1
+  ${rrc_h}
+  ${s1ap_h}
   ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
   ${OPENAIR_TARGETS}/RT/USER/lte-enb.c
   ${OPENAIR_TARGETS}/RT/USER/lte-ru.c
   ${OPENAIR_TARGETS}/RT/USER/lte-softmodem.c
-  ${OPENAIR_TARGETS}/RT/USER/lte-softmodem-common.c
   ${OPENAIR2_DIR}/ENB_APP/NB_IoT_interface.c
   ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
   ${OPENAIR_TARGETS}/COMMON/create_tasks.c
@@ -1999,7 +2000,6 @@ add_executable(lte-softmodem-nos1
   ${CONFIG_SOURCES}
   ${SHLIB_LOADER_SOURCES}
   )
-add_dependencies(lte-softmodem-nos1 rrc_flag s1ap_flag x2_flag)
 target_link_libraries (lte-softmodem-nos1
   -Wl,--start-group
   RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB SCHED_RU_LIB PHY_COMMON PHY PHY_RU LFDS L2  ${RAL_LIB} ${ITTI_LIB}
@@ -2016,10 +2016,11 @@ target_link_libraries (lte-softmodem-nos1 ${T_LIB})
 #######################################
 
 add_executable(lte-uesoftmodem
+  ${rrc_h}
+  ${s1ap_h}
   ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
   ${OPENAIR_TARGETS}/RT/USER/lte-ue.c
   ${OPENAIR_TARGETS}/RT/USER/lte-uesoftmodem.c
-  ${OPENAIR_TARGETS}/RT/USER/lte-softmodem-common.c
   ${OPENAIR_TARGETS}/RT/USER/lte-ru.c
   ${OPENAIR_TARGETS}/RT/USER/rfsim.c
   ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
@@ -2038,7 +2039,6 @@ add_executable(lte-uesoftmodem
   ${SHLIB_LOADER_SOURCES}
   )
 
-add_dependencies(lte-uesoftmodem rrc_flag s1ap_flag x2_flag)
 target_link_libraries (lte-uesoftmodem
   -Wl,--start-group
   RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_UE PHY_RU LFDS L2_UE SIMU
@@ -2054,10 +2054,11 @@ target_link_libraries (lte-uesoftmodem ${T_LIB})
 # lte-uesoftmodem-nos1 is UE implementation
 ###################################################
 add_executable(lte-uesoftmodem-nos1
+  ${rrc_h}
+  ${s1ap_h}
   ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
   ${OPENAIR_TARGETS}/RT/USER/lte-ue.c
   ${OPENAIR_TARGETS}/RT/USER/lte-uesoftmodem.c
-  ${OPENAIR_TARGETS}/RT/USER/lte-softmodem-common.c
   ${OPENAIR_TARGETS}/RT/USER/lte-ru.c
   ${OPENAIR_TARGETS}/RT/USER/rfsim.c
   ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
@@ -2077,7 +2078,6 @@ add_executable(lte-uesoftmodem-nos1
   ${SHLIB_LOADER_SOURCES}
   )
 
-add_dependencies(lte-uesoftmodem-nos1 rrc_flag s1ap_flag x2_flag)
 target_link_libraries (lte-uesoftmodem-nos1
   -Wl,--start-group
   RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_UE PHY_RU LFDS L2_UE SIMU ${RAL_LIB} ${ITTI_LIB}
@@ -2154,6 +2154,7 @@ add_executable(test_epc_generate_scenario
   ${OPENAIR2_DIR}/ENB_APP/enb_config.h
   ${OPENAIR2_DIR}/COMMON/commonDef.h
   ${OPENAIR2_DIR}/COMMON/messages_def.h
+  ${OPENAIR2_DIR}/COMMON/messages_types.h
   ${OPENAIR3_DIR}/S1AP/s1ap_eNB_defs.h
   )
 target_link_libraries (test_epc_generate_scenario
@@ -2173,6 +2174,7 @@ add_executable(test_epc_play_scenario
   ${OPENAIR3_DIR}/TEST/EPC_TEST/play_scenario.h
   ${OPENAIR2_DIR}/COMMON/commonDef.h
   ${OPENAIR2_DIR}/COMMON/messages_def.h
+  ${OPENAIR2_DIR}/COMMON/messages_types.h
   )
 target_include_directories(test_epc_play_scenario PUBLIC /usr/local/share/asn1c)
 target_link_libraries (test_epc_play_scenario

cmake_targets/at_commands/CMakeLists.txt

@@ -76,6 +76,7 @@ macro(add_boolean_option name val helpstr)
 endmacro(add_boolean_option)
 
 # compilation flags
+# added CMAKER conditional compilation to not bother legacy building system
 #############################################
 if(NOT CMAKE_BUILD_TYPE)
 set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
@@ -83,7 +84,7 @@ endif()
 set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Debug Release RelWithDebInfo MinSizeRel)
 
 #
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.2 -std=gnu99 -Wall -Wstrict-prototypes -fno-strict-aliasing -rdynamic -funroll-loops -Wno-packed-bitfield-compat ")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.2 -std=gnu99 -Wall -Wstrict-prototypes -fno-strict-aliasing -rdynamic -funroll-loops -Wno-packed-bitfield-compat -DCMAKER")
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb -DMALLOC_CHECK_=3")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -ggdb -DMALLOC_CHECK_=3 -O2")
 

cmake_targets/build_oai

@@ -43,7 +43,6 @@ conf_nvram_path=$OPENAIR_DIR/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
 MSC_GEN=0
 XFORMS="True"
 UE_EXPANSION="False"
-UESIM_EXPANSION="False"
 PRINT_STATS="False"
 VCD_TIMING="False"
 DEADLINE_SCHEDULER_FLAG_USER="False"
@@ -219,10 +218,6 @@ function main() {
             UE_EXPANSION="True"
             echo_info "Will compile with UE_EXPANSION"
             shift;;
-       --musim)
-            UESIM_EXPANSION="True"
-            echo_info "Will compile with UESIM_EXPANSION"
-            shift;;
        --UE-conf-nvram)
             conf_nvram_path=$(readlink -f $2)
             shift 2;;
@@ -236,7 +231,7 @@ function main() {
        -w | --hardware)
             HW="$2" #"${i#*=}"
             # Use OAI_USRP  as the key word USRP is used inside UHD driver           
-            if [ "$HW" != "BLADERF" -a  "$HW" != "USRP" -a "$HW" != "LMSSDR" -a  "$HW" != "None" -a  "$HW" != "EXMIMO" -a  "$HW" != "IRIS"  ] ; then 
+	    if [ "$HW" != "BLADERF" -a  "$HW" != "USRP" -a "$HW" != "LMSSDR" -a  "$HW" != "None" -a  "$HW" != "EXMIMO" -a "$HW" != "IRIS" ] ; then
 		echo_fatal "Unknown HW type $HW will exit..."		
 	    else
 		if [ "$HW" == "USRP" ] ; then 
@@ -248,9 +243,9 @@ function main() {
 		if [ "$HW" == "LMSSDR" ] ; then 
 		    HW="OAI_LMSSDR"
 		fi 
-                if [ "$HW" == "IRIS" ] ; then
-                    HW="OAI_IRIS"
-                fi
+		if [ "$HW" == "IRIS" ] ; then
+		    HW="OAI_IRIS"
+		fi
 		echo_info "Setting hardware to: $HW"
 	    fi
             shift 2;;
@@ -422,8 +417,8 @@ function main() {
         DEADLINE_SCHEDULER_FLAG_USER="False"
      elif [ "$HW" = "OAI_BLADERF" ] ; then 
         DEADLINE_SCHEDULER_FLAG_USER="False"
-     elif [ "$HW" = "OAI_LMSSDR" ] ; then     
-        DEADLINE_SCHEDULER_FLAG_USER="False" 
+     elif [ "$HW" = "OAI_LMSSDR" ] ; then 
+        DEADLINE_SCHEDULER_FLAG_USER="False"
      elif [ "$HW" = "OAI_IRIS" ] ; then
         DEADLINE_SCHEDULER_FLAG_USER="False"
      elif [ "$HW" = "None" ] ; then 
@@ -501,17 +496,17 @@ function main() {
       #  flash_firmware_iris
       #fi
     fi
-    echo_info "installing protobuf/protobuf-c for flexran agent support"
-    install_protobuf_from_source
-    install_protobuf_c_from_source
+    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
     echo_info "Installing optional packages"
     check_install_additional_tools
-  fi
-
-  
+  fi  
   
   echo_info "3. building the compilation directives ..."
 
@@ -556,7 +551,6 @@ function main() {
     echo "set ( UE_EXPANSION $UE_EXPANSION )"      >>  $cmake_file
 #    echo "set ( PHY_TX_THREAD $UE_EXPANSION )"     >>  $cmake_file
     echo "set ( PRE_SCD_THREAD $UE_EXPANSION )"    >>  $cmake_file
-    echo "set ( UESIM_EXPANSION $UESIM_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
@@ -669,9 +663,6 @@ function main() {
     compilations \
           lte-simulators coding \
           libcoding.so $dbin/libcoding.so
-#    compilations \
-#	  lte-simulators $config_libconfig_shlib \
-#	  lib$config_libconfig_shlib.so $dbin/lib$config_libconfig_shlib.so
   fi
 
   # Core simulators
@@ -748,7 +739,7 @@ function main() {
 
 	      ln -sf liboai_exmimodevif.so liboai_device.so
 	      ln -sf $dbin/liboai_exmimodevif.so.$REL $dbin/liboai_device.so
-	      echo_info "liboai_device.so is linked to EXMIMO device library"       
+	      echo_info "liboai_device.so is linked to EXMIMO device library"
 	  elif [ "$HW" == "OAI_USRP" ] ; then
               compilations \
                   $build_dir oai_usrpdevif \
@@ -777,15 +768,15 @@ function main() {
 	      ln -sf liboai_lmssdrdevif.so liboai_device.so
 	      ln -sf $dbin/liboai_lmssdrdevif.so.$REL $dbin/liboai_device.so
 	      echo_info "liboai_device.so is linked to LMSSDR device library"	 
-          elif [ "$HW" == "OAI_IRIS" ] ; then
-                  compilations \
-                      $build_dir oai_irisdevif \
-                      liboai_irisdevif.so $dbin/liboai_irisdevif.so.$REL
+	  elif [ "$HW" == "OAI_IRIS" ] ; then
+		  compilations \
+		      $build_dir oai_irisdevif \
+		      liboai_irisdevif.so $dbin/liboai_irisdevif.so.$REL
 
-              ln -s liboai_irisdevif.so liboai_device.so
-              ln -s $dbin/liboai_irisdevif.so.$REL $dbin/liboai_device.so
-              echo_info "liboai_device.so is linked to IRIS device library"
-	  else 
+	      ln -s liboai_irisdevif.so liboai_device.so
+	      ln -s $dbin/liboai_irisdevif.so.$REL $dbin/liboai_device.so
+	      echo_info "liboai_device.so is linked to IRIS device library"
+	  else
 	      echo_info "liboai_device.so is not linked to any device library"	    
 	  fi
       fi

cmake_targets/iris-command.txt

@@ -0,0 +1,17 @@
+
+BS TDD:
+
+sudo -E ./lte-softmodem-nos1 -d -O /usr/git/openairinterface5g/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.iris030.tdd.conf --tx-sample-advance -40 2>&1
+
+UE TDD:
+
+sudo -E ./lte-softmodem-nos1  -U -T -C2580000000 -r25 --ue-txgain 52 --ue-rxgain 113 --rrh-remote-address 0118 -d -g 9 -G 0x75 --tx-sample-advance -40 >&1
+
+BS FDD:
+
+sudo -E ./lte-softmodem-nos1 -d -O /usr/git/openairinterface5g/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.iris030.conf --tx-sample-advance -40 2>&1
+
+UE FDD:
+
+sudo -E ./lte-softmodem-nos1  -U -C2660000000 -r25 --ue-txgain 52 --ue-rxgain 113 --rrh-remote-address 0118 -d -g 9 -G 0x75 --tx-sample-advance -40 >&1 
+

cmake_targets/tools/build_helper

@@ -32,8 +32,8 @@ 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 --skip-broken"; CMAKE="cmake3" ;;
-  centos) OS_BASEDISTRO="fedora"; INSTALLER="yum --skip-broken"; CMAKE="cmake3" ;;
+  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
@@ -372,7 +372,7 @@ check_install_lmssdr_driver(){
         else
                 echo_error "lmssdr support implies installing lmssdr drivers and tools" \
                            " from sources. check:"
-                echo_info "https://wiki.myriadrf.org/Lime_Suite"
+                echo_info "https://open-cells.com/index.php/2017/05/10/limesdr-installation/"
                 echo_fatal "Cannot compile lmssdr device"
 	fi
 
@@ -386,8 +386,8 @@ install_soapy_from_source(){
     cd /tmp
     echo "Downloading SoapySDR"
     rm -rf /tmp/soapysdr
-    git clone -b soapy-sdr-0.7.0 --single-branch https://github.com/pothosware/SoapySDR.git
-    cd SoapySDR
+    git clone https://github.com/pothosware/SoapySDR.git
+    cd soapysdr
     #git checkout tags/release_003_010_001_001
     mkdir -p build
     cd build
@@ -399,8 +399,8 @@ install_soapy_from_source(){
     cd /tmp
     echo "Downloading SoapyRemote"
     rm -rf /tmp/soapyremote
-    git clone -b soapy-remote-0.5.0 --single-branch https://github.com/pothosware/SoapyRemote.git
-    cd SoapyRemote
+    git clone https://github.com/pothosware/SoapyRemote.git
+    cd soapyremote
     #git checkout tags/release_003_010_001_001
     mkdir -p build
     cd build
@@ -419,7 +419,7 @@ install_soapy_iris_from_source(){
     cd /tmp
     echo "Downloading SoapyIris"
     rm -rf /tmp/sklk-soapyiris
-    git clone -b soapy-iris-2018.08.0.1 --single-branch https://github.com/skylarkwireless/sklk-soapyiris.git
+    git clone https://github.com/skylarkwireless/sklk-soapyiris.git
     cd sklk-soapyiris
     mkdir -p build
     cd build
@@ -434,19 +434,28 @@ install_soapy_iris_from_source(){
 check_install_soapy () {
     #if [[ "$OS_DISTRO" == "ubuntu" ]]; then
         #first we remove old installation
-    $SUDO apt-get remove -y soapysdr soapysdr-server libsoapysdr-dev python-soapysdr python3-soapysdr soapysdr-module-remote || true
-        #$SUDO add-apt-repository -y ppa:myriadrf/drivers
-        #$SUDO apt-get update
-        #$SUDO apt-get install -y soapysdr soapysdr-server libsoapysdr-dev python-soapysdr python3-soapysdr soapysdr-module-remote
+        $SUDO apt-get remove -y soapysdr soapysdr-server libsoapysdr-dev python-soapysdr python3-soapysdr soapysdr-module-remote || true
+        $SUDO add-apt-repository -y ppa:myriadrf/drivers
+        $SUDO apt-get update
+        $SUDO apt-get install -y soapysdr soapysdr-server libsoapysdr-dev python-soapysdr python3-soapysdr soapysdr-module-remote
 
     #elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
     #    $SUDO $INSTALLER -y install software-properties-common python3-software-properties python-software-properties subversion git python3 python-numpy python3-numpy cmake swig python-dev
-    install_soapy_from_source
+    #    install_soapy_from_source
     #fi
     install_soapy_iris_from_source
 
 }
 
+# we don't have this tool yet.
+#flash_firmware_iris() {
+    #if [ -z $1 ]; then
+    #  $SUDO iris_images_downloader
+    #else
+    #  $SUDO iris_images_downloader -i $1
+    #fi
+#}
+
 check_install_additional_tools (){
   $SUDO $INSTALLER update -y
   if [[ "$OS_DISTRO" == "ubuntu" ]]; then

cmake_targets/tools/init_nas_s1

@@ -52,20 +52,20 @@ load_module ../../targets/bin/ue_ip.ko
 
 if [ "$1" = "UE" ]; then
   echo "bring up $LTEIF interface for UE"
-  sudo ifconfig $LTEIF up
+  ifconfig $LTEIF up
 fi
 
-sudo ip route flush cache
+ip route flush cache
 sleep 1
-sudo sysctl -w net.ipv4.conf.all.log_martians=1
+sysctl -w net.ipv4.conf.all.log_martians=1
 echo "Disabling reverse path filtering"
-sudo sysctl -w net.ipv4.conf.all.rp_filter=0
-sudo ip route flush cache
+sysctl -w net.ipv4.conf.all.rp_filter=0
+ip route flush cache
 
 # Check table 200 lte in /etc/iproute2/rt_tables
 fgrep lte /etc/iproute2/rt_tables  > /dev/null 
 if [ $? -ne 0 ]; then
     echo "200 lte " >> /etc/iproute2/rt_tables
 fi
-sudo ip rule add fwmark 1 table lte
-sudo ip route add default dev $LTEIF table lte
+ip rule add fwmark 1 table lte
+ip route add default dev $LTEIF table lte

cmake_targets/tools/make_asn1c_includes.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-GENERATED_FULL_DIR=$1
-shift
-ASN1_SOURCE_DIR=$1
-shift
-export ASN1C_PREFIX=$1 
-shift
-options=$*
-done_flag="$GENERATED_FULL_DIR"/done
-if [ "$done_flag" -ot $ASN1_SOURCE_DIR ] ; then 
-   rm -f "$GENERATED_FULL_DIR"/${ASN1C_PREFIX}*.c "$GENERATED_FULL_DIR"/${ASN1C_PREFIX}*.h
-   mkdir -p "$GENERATED_FULL_DIR"
-   asn1c -pdu=all -fcompound-names -gen-PER -no-gen-OER -no-gen-example $options -D $GENERATED_FULL_DIR $ASN1_SOURCE_DIR |& egrep -v "^Copied|^Compiled" | sort -u
-fi
-touch $done_flag

common/config/DOC/config.md

@@ -1,6 +1,6 @@
 # OAI configuration module
 
-The configuration module provides an api that other oai components can use to get parameters at init time. It defines a parameter structure, used to describe parameters attributes (for example name and  type). The same structure includes a pointer to the variable where the configuration module writes the parameter value, at run time, when calling config_get or config_getlist functions. For each parameter a function to check the value can be specified and pre-defined functions  are provided for some common parameter validations (integer in a range or in a list, string in a list).  The module also include an api to check that no unknown options have been entered on the command line and a a mechanism to display a help text for suppoted parameters.
+The configuration module provides an api that other oai components can use to get parameters at init time. It defines a parameter structure, used to describe parameters attributes (for example name and  type). The same structure includes a pointer to the variable where the configuration module writes the parameter value, at run time, when calling config_get or config_getlist functions. For each parameter a function to check the value can be specified and pre-defined functions  are provided for some common parameter validations (integer in a range or in a list, string in a list).  The module also include a mechanism to check that no unknown options have been entered on the command line
 
 ## Documentation
 

common/config/DOC/config/devusage/api.md

@@ -1,12 +1,11 @@
 ```c
-configmodule_interface_t *load_configmodule(int argc, char **argv, uint32_t initflags)
+configmodule_interface_t *load_configmodule(int argc, char **argv)
 ```
 * Parses the command line options, looking for the –O argument
 * Loads the `libparams_<configsource>.so` (today `libparams_libconfig.so`)  shared library
 * Looks for `config_<config source>_init` symbol and calls it , passing it an array of string corresponding to the « : » separated strings used in the –O option
 * Looks for `config_<config source>_get`, `config_<config source>_getlist` and  `config_<config source>_end` symbols which are the three functions a configuration library should implement. Get and getlist are mandatory, end is optional.
-* Stores all the necessary information in a `configmodule_interface_t structure`, which is of no use for caller as long as we only use one configuration source.
-*  if the bit CONFIG_ENABLECMDLINEONLY is set in `initflags` then the module allows parameters to be set only via the command line. This is used for the oai UE.
+* Stores all the necessary information in a `configmodule_interface_t structure`, which is of no use for caller as long as we only use one configuration source.  
 
 ```c
 void End_configmodule(void)

common/config/DOC/config/rtusage.md

@@ -27,63 +27,6 @@ $ ./lte-softmodem -O libconfig:<config>:dbgl1
 ```bash
 $ ./lte-uesoftmodem -O cmdlineonly:dbgl1
 ```
-To get help on supported parameters you can use specific options:
-*  ---help: print help for command line only parameters and for parameters not defined in a specific section 
-	*  ---help_< prefix > : print help for parameters defined under the section < prefix >
-
-```
-./lte-softmodem -O libconfig:/usr/local/oai/conf/enb.nbiot.band7.tm1.50PRB.usrpb210.conf   --help
-[CONFIG] get parameters from libconfig /usr/local/oai/conf/enb.nbiot.band7.tm1.50PRB.usrpb210.conf , debug flags: 0x00000000
-.............................................
-[LIBCONFIG] (root): 19/19 parameters successfully set, (16 to default value)
-
------Help for section (root section)            : 019 entries------
-    --rf-config-file: Configuration file for front-end (e.g. LMS7002M)
-    --ulsch-max-errors: set the eNodeB max ULSCH erros
-    --phy-test: test UE phy layer, mac disabled
-    --usim-test: use XOR autentication algo in case of test usim mode
-    --emulate-rf: Emulated RF enabled(disable by defult)
-    --clock: tells hardware to use a clock reference (0:internal, 1:external, 2:gpsdo)
-    --wait-for-sync: Help string not specified
-    --single-thread-enable: Disables single-thread mode in lte-softmodem
-    -C: Set the downlink frequency for all component carriers
-    -a: Channel id offset
-    -d: Enable soft scope and L1 and L2 stats (Xforms)
-    -q: Enable processing timing measurement of lte softmodem on per subframe basis 
-    -S: Skip the missed slots/subframes 
-    --numerology: adding numerology for 5G
-    --parallel-config: three config for level of parallelism 'PARALLEL_SINGLE_THREAD', 'PARALLEL_RU_L1_SPLIT', or 'PARALLEL_RU_L1_TRX_SPLIT'
-    --worker-config: two option for worker 'WORKER_DISABLE' or 'WORKER_ENABLE'
-    --nbiot-disable: disable nb-iot, even if defined in config
-    --noS1: Disable s1 interface
-    --nokrnmod: (noS1 only): Use tun instead of namesh module 
---------------------------------------------------------------------
-
-[LIBCONFIG] (root): 4/4 parameters successfully set, (4 to default value)
-
------Help for section (root section)            : 004 entries------
-    -R: Enable online log 
-    -g: Set the global log level, valide options: (4:trace, 3:debug, 2:info, 1:warn, (0:error))
-    --telnetsrv: Start embedded telnet server 
-    --msc: Enable the MSC tracing utility 
---------------------------------------------------------------------
-
-[LIBCONFIG] loader: 2/2 parameters successfully set, (2 to default value)
-[LIBCONFIG] loader.telnetsrv: 2/2 parameters successfully set, (1 to default value)
-[LOADER] library libtelnetsrv.so is not loaded: libtelnetsrv.so: cannot open shared object file: No such file or directory
-Getting ENBSParams
-[LIBCONFIG] (root): 3/3 parameters successfully set, (1 to default value)
-
------Help for section (root section)            : 003 entries------
-    --Asn1_verbosity: Help string not specified
-    --Active_eNBs: Help string not specified
-    --noS1: Help string not specified
---------------------------------------------------------------------
-
-/usr/local/oai/issue390_configmodule_cmdlinebug/openairinterface5g/common/config/config_cmdline.c:224 config_process_cmdline() Exiting OAI softmodem: [CONFIG] Exiting after displaying help
-
-```
-
 For the lte-softmodem (the eNodeB) The config source parameter defaults to libconfig, preserving the initial -O option format. In this case you cannot specify the debug level.  
 
 ```bash

common/config/config_cmdline.c

@@ -20,7 +20,7 @@
  */
 
 /*! \file common/config/cmdline/config_libconfig.c
- * \brief configuration module, command line parsing implementation
+ * \brief configuration module, command line parsing implementation 
  * \author Francois TABURET
  * \date 2017
  * \version 0.1
@@ -37,259 +37,183 @@
 #include <errno.h>
 #include <platform_types.h>
 #include "config_userapi.h"
-#include "../utils/LOG/log.h"
 
-int parse_stringlist(paramdef_t *cfgoptions, char *val) {
-  char *atoken;
-  char *tokctx;
-  char *tmpval=strdup(val);
-  int   numelt=0;
-  cfgoptions->numelt=0;
-  atoken=strtok_r(tmpval, ",",&tokctx);
 
-  while(atoken != NULL) {
-    numelt++ ;
-    atoken=strtok_r(NULL, ",",&tokctx);
-  }
+int parse_stringlist(paramdef_t *cfgoptions, char *val)
+{
+char *atoken;
+char *tokctx;
+char *tmpval=strdup(val);
+int   numelt=0;
 
-  free(tmpval);
-  config_check_valptr(cfgoptions,(char **)&(cfgoptions->strlistptr), sizeof(char *) * numelt);
-  cfgoptions->numelt=numelt;
-  atoken=strtok_r(val, ",",&tokctx);
+   cfgoptions->numelt=0;
 
-  for( int i=0; i<cfgoptions->numelt && atoken != NULL ; i++) {
-    config_check_valptr(cfgoptions,&(cfgoptions->strlistptr[i]),strlen(atoken)+1);
-    sprintf(cfgoptions->strlistptr[i],"%s",atoken);
-    printf_params("[LIBCONFIG] %s[%i]: %s\n", cfgoptions->optname,i,cfgoptions->strlistptr[i]);
-    atoken=strtok_r(NULL, ",",&tokctx);
-  }
+   atoken=strtok_r(tmpval, ",",&tokctx);
+   while(atoken != NULL) {
+     numelt++ ;
+     atoken=strtok_r(NULL, ",",&tokctx);
+   }
+   free(tmpval);
+   config_check_valptr(cfgoptions,(char **)&(cfgoptions->strlistptr), sizeof(char *) * numelt);
+   cfgoptions->numelt=numelt;
 
-  return (cfgoptions->numelt > 0);
+   atoken=strtok_r(val, ",",&tokctx);
+   for( int i=0; i<cfgoptions->numelt && atoken != NULL ; i++) {
+      config_check_valptr(cfgoptions,&(cfgoptions->strlistptr[i]),strlen(atoken)+1);
+      sprintf(cfgoptions->strlistptr[i],"%s",atoken);
+      printf_params("[LIBCONFIG] %s[%i]: %s\n", cfgoptions->optname,i,cfgoptions->strlistptr[i]);
+      atoken=strtok_r(NULL, ",",&tokctx);
+   }
+   return (cfgoptions->numelt > 0); 
+}
+ 
+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:
+           optisset=parse_stringlist(cfgoptions,tmpval); 
+        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 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 */
-      CONFIG_PRINTF_ERROR("[CONFIG] command line, option %s requires an argument\n",cfgoptions->optname);
-    } else {        /* boolean value option without argument, set value to true*/
-      tmpval = defbool;
-    }
-  }
-
-  switch(cfgoptions->type) {
-      char *charptr;
-
-    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:
-      optisset=parse_stringlist(cfgoptions,tmpval);
-      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,&charptr,0));
-
-      if( *charptr != 0) {
-        CONFIG_PRINTF_ERROR("[CONFIG] command line, option %s requires an integer argument\n",cfgoptions->optname);
-      }
-
-      optisset=1;
-      break;
-
-    case TYPE_UINT64:
-    case TYPE_INT64:
-      config_check_valptr(cfgoptions, (char **)&(cfgoptions->i64ptr),sizeof(uint64_t));
-      *(cfgoptions->i64ptr)=strtoll(tmpval,&charptr,0);
-
-      if( *charptr != 0) {
-        CONFIG_PRINTF_ERROR("[CONFIG] command line, option %s requires an integer argument\n",cfgoptions->optname);
-      }
-
-      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,&charptr);
-
-      if( *charptr != 0) {
-        CONFIG_PRINTF_ERROR("[CONFIG] command line, option %s requires a double argument\n",cfgoptions->optname);
-      }
-
-      printf_cmdl("[CONFIG] %s set to  %lf from command line\n", cfgoptions->optname, *(cfgoptions->dblptr));
-      optisset=1;
-      break;
-
-    case TYPE_IPV4ADDR:
-      break;
-
-    default:
-      CONFIG_PRINTF_ERROR("[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;
-}
-
-/*--------------------------------------------------------------------*/
-/*  check unknown options in the command line
-*/
-int config_check_unknown_cmdlineopt(char *prefix) {
-  int unknowndetected=0;
-  char testprefix[CONFIG_MAXOPTLENGTH];
-  int finalcheck = 0;
-
-  memset(testprefix,0,sizeof(testprefix));
-  if (prefix != NULL) {
-    if (strcmp(prefix,CONFIG_CHECKALLSECTIONS) == 0)
-      finalcheck = 1;
-    else if (strlen(prefix) > 0) {
-      sprintf(testprefix,"--%.*s.",CONFIG_MAXOPTLENGTH-1,prefix);
-    }
-  }
-
-  for (int i=1; i<config_get_if()->argc ; i++) {
-    if ( !finalcheck && strstr(config_get_if()->argv[i],testprefix) == NULL ) continue;
-
-    if ( !finalcheck && testprefix[0]==0 && index(config_get_if()->argv[i],'.') != NULL) continue;
-
-    if ( !finalcheck && isdigit(config_get_if()->argv[i][0])) continue;
-
-    if ( !finalcheck && config_get_if()->argv[i][0] == '-' && isdigit(config_get_if()->argv[i][1])) continue;
-
-    if ( (config_get_if()->argv_info[i] & CONFIG_CMDLINEOPT_PROCESSED) == 0 ) {
-      fprintf(stderr,"[CONFIG] unknown option: %s\n",
-              config_get_if()->argv[i] );
-      unknowndetected++;
-    }
-  }
-
-  if (unknowndetected > 0) {
-    CONFIG_PRINTF_ERROR("[CONFIG] %i unknown option(s) in command line starting with %s (section %s)\n",
-                        unknowndetected,testprefix,((prefix==NULL)?"":prefix));
-  }
-
-  return unknowndetected;
-}  /* config_check_unknown_cmdlineopt */
-
-int config_process_cmdline(paramdef_t *cfgoptions,int numoptions, char *prefix) {
+int config_process_cmdline(paramdef_t *cfgoptions,int numoptions, char *prefix)
+{
   int c = config_get_if()->argc;
   int i,j;
   char *pp;
-  char cfgpath[CONFIG_MAXOPTLENGTH];
+  char cfgpath[512]; /* 512 should be enough for the sprintf below */
+ 
   j = 0;
   i = 0;
-
-  while (c > 0 ) {
-    char *oneargv = strdup(config_get_if()->argv[i]);          /* we use strtok_r which modifies its string paramater, and we don't want argv to be modified */
-
-    /* first check help options, either --help, -h or --help_<section> */
-    if (strncmp(oneargv, "-h",2) == 0 || strncmp(oneargv, "--help",6) == 0 ) {
-      char *tokctx;
-      pp=strtok_r(oneargv, "_",&tokctx);
-      config_get_if()->argv_info[i] |= CONFIG_CMDLINEOPT_PROCESSED;
-
-      if (pp == NULL || strcasecmp(pp,config_get_if()->argv[i] ) == 0 ) {
-        if( prefix == NULL) {
-          config_printhelp(cfgoptions,numoptions,"(root section)");
-
-          if ( ! ( CONFIG_ISFLAGSET(CONFIG_NOEXITONHELP)))
-            exit_fun("[CONFIG] Exiting after displaying help\n");
-        }
-      } else {
-        pp=strtok_r(NULL, " ",&tokctx);
-
-        if ( prefix != NULL && pp != NULL && strncasecmp(prefix,pp,strlen(pp)) == 0 ) {
-          config_printhelp(cfgoptions,numoptions,prefix);
-
-          if ( ! (CONFIG_ISFLAGSET(CONFIG_NOEXITONHELP))) {
-            fprintf(stderr,"[CONFIG] %s %i section %s:", __FILE__, __LINE__, prefix);
-            exit_fun(" Exiting after displaying help\n");
-          }
-        }
-      }
-    }
-
-    /* now, check for non help options */
-    if (oneargv[0] == '-') {
-      for(int n=0; n<numoptions; n++) {
-        if ( ( cfgoptions[n].paramflags & PARAMFLAG_DISABLECMDLINE) != 0) {
-          continue;
+    while (c > 0 ) {
+        char *oneargv = strdup(config_get_if()->argv[i]);          /* we use strtok_r which modifies its string paramater, and we don't want argv to be modified */
+        /* first check help options, either --help, -h or --help_<section> */
+        if (strncmp(oneargv, "-h",2) == 0 || strncmp(oneargv, "--help",6) == 0 ) {
+            char *tokctx;
+            pp=strtok_r(oneargv, "_",&tokctx);
+            if (pp == NULL || strcasecmp(pp,config_get_if()->argv[i] ) == 0 ) {
+                if( prefix == NULL) {
+                  config_printhelp(cfgoptions,numoptions);
+                  if ( ! ( CONFIG_ISFLAGSET(CONFIG_NOEXITONHELP)))
+                     exit_fun("[CONFIG] Exiting after displaying help\n");
+                }
+            } else {
+                pp=strtok_r(NULL, " ",&tokctx);
+                if ( prefix != NULL && pp != NULL && strncasecmp(prefix,pp,strlen(pp)) == 0 ) { 
+                   printf ("Help for %s section:\n",prefix);               
+                   config_printhelp(cfgoptions,numoptions);
+                   if ( ! (CONFIG_ISFLAGSET(CONFIG_NOEXITONHELP))) {
+                      fprintf(stderr,"[CONFIG] %s %i section %s:", __FILE__, __LINE__, prefix);
+                      exit_fun(" Exiting after displaying help\n");
+                   }
+                }
+            } 
         }
 
-        if (prefix != NULL) {
-          sprintf(cfgpath,"%s.%s",prefix,cfgoptions[n].optname);
-        } else {
-          sprintf(cfgpath,"%s",cfgoptions[n].optname);
-        }
-
-        if ( ((strlen(oneargv) == 2) && (strcmp(oneargv + 1,cfgpath) == 0))  || /* short option, one "-" */
-             ((strlen(oneargv) > 2) && (strcmp(oneargv + 2,cfgpath ) == 0 )) ) {
-          char *valptr=NULL;
-          int ret;
-          config_get_if()->argv_info[i] |= CONFIG_CMDLINEOPT_PROCESSED;
-
-          if (c > 0) {
-            pp = config_get_if()->argv[i+1];
-
-            if (pp != NULL ) {
-              ret = strlen(pp);
-
-              if (ret > 0 ) {
-                if (pp[0] != '-')
-                  valptr=pp;
-                else if ( ret > 1 && pp[0] == '-' && isdigit(pp[1]) )
-                  valptr=pp;
-              }
-            }
-          }
-
-          j += processoption(&(cfgoptions[n]), valptr);
-
-          if (  valptr != NULL ) {
-            i++;
-            config_get_if()->argv_info[i] |= CONFIG_CMDLINEOPT_PROCESSED;
-            c--;
-          }
-
-          break;
-        }
-      } /* for n... */
-    } /* if (oneargv[0] == '-') */
-
-    free(oneargv);
-    i++;
-    c--;
-  }   /* fin du while */
-
+        /* now, check for non help options */
+        if (oneargv[0] == '-') {        
+    	    for(int n=0;n<numoptions;n++) {
+    		if ( ( cfgoptions[n].paramflags & PARAMFLAG_DISABLECMDLINE) != 0) {
+    		  continue;
+    		 }
+    		if (prefix != NULL) {
+    		   sprintf(cfgpath,"%s.%s",prefix,cfgoptions[n].optname);
+    		} else {
+    		   sprintf(cfgpath,"%s",cfgoptions[n].optname);
+    		}
+    		if ( ((strlen(oneargv) == 2) && (strcmp(oneargv + 1,cfgpath) == 0))  || /* short option, one "-" */
+    		     ((strlen(oneargv) > 2) && (strcmp(oneargv + 2,cfgpath ) == 0 )) ) {
+                   char *valptr=NULL;
+                   int ret;
+                   if (c > 0) {
+    		      pp = config_get_if()->argv[i+1];
+                      if (pp != NULL ) {                      
+                         ret = strlen(pp);
+                         if (ret > 0 ) {
+                             if (pp[0] != '-')
+                                valptr=pp;
+                             else if ( ret > 1 && pp[0] == '-' && isdigit(pp[1]) )
+                                valptr=pp;
+                         }
+                     }
+                   }
+                   j += processoption(&(cfgoptions[n]), valptr);
+    		   if (  valptr != NULL ) {
+                      i++;
+                      c--;
+    		   } 
+                   break;
+    		}
+    	     } /* for n... */
+         } /* if (oneargv[0] == '-') */  	     
+         free(oneargv);
+         i++;
+         c--;  
+    }   /* fin du while */
   printf_cmdl("[CONFIG] %s %i options set from command line\n",((prefix == NULL) ? "(root)":prefix),j);
-  return j;
+  return j;            
 }  /* parse_cmdline*/

common/config/config_load_configmodule.c

@@ -20,7 +20,7 @@
  */
 
 /*! \file common/config/config_load_configmodule.c
- * \brief configuration module, load the shared library implementing the configuration module
+ * \brief configuration module, load the shared library implementing the configuration module 
  * \author Francois TABURET
  * \date 2017
  * \version 0.1
@@ -36,323 +36,288 @@
 #include <unistd.h>
 #include <errno.h>
 #include <dlfcn.h>
-#include <platform_types.h>
 
 #define CONFIG_LOADCONFIG_MAIN
 #include "config_load_configmodule.h"
 #include "config_userapi.h"
-#include "../utils/LOG/log.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;
 
-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);
+   st=0;  
+   sprintf(libname,CONFIG_SHAREDLIBFORMAT,cfgptr->cfgmode);
 
-  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);
+   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);
 
-    sprintf (fname,"config_%s_getlist",cfgptr->cfgmode);
-    cfgptr->getlist = 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);	 
+      }
 
-    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_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;
+      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 */
 int nooptfunc(void) {
-  return 0;
+   return 0;
 };
 
-int config_cmdlineonly_getlist(paramlist_def_t *ParamList,
-                               paramdef_t *params, int numparams, char *prefix) {
-  ParamList->numelt = 0;
-  return 0;
+int config_cmdlineonly_getlist(paramlist_def_t *ParamList, 
+                                   paramdef_t *params, int numparams, char *prefix)
+{
+     ParamList->numelt = 0;
+     return 0;
 }
 
 
-int config_cmdlineonly_get(paramdef_t *cfgoptions,int numoptions, char *prefix ) {
+int config_cmdlineonly_get(paramdef_t *cfgoptions,int numoptions, char *prefix )
+{
   int defval;
   int fatalerror=0;
   int numdefvals=0;
+  
 
-  for(int i=0; i<numoptions; i++) {
-    defval=0;
-
-    switch(cfgoptions[i].type) {
-      case TYPE_STRING:
-        defval=config_setdefault_string(&(cfgoptions[i]), prefix);
+  for(int i=0;i<numoptions;i++) {
+     defval=0;
+     switch(cfgoptions[i].type) {
+       case TYPE_STRING:
+            defval=config_setdefault_string(&(cfgoptions[i]), prefix);
+       break;
+       case TYPE_STRINGLIST:
+            defval=config_setdefault_stringlist(&(cfgoptions[i]), prefix);
+       break;
+       	case TYPE_UINT8:
+       	case TYPE_INT8:	
+       	case TYPE_UINT16:
+       	case TYPE_INT16:
+       	case TYPE_UINT32:
+       	case TYPE_INT32:
+       	case TYPE_MASK:	
+             defval=config_setdefault_int(&(cfgoptions[i]), prefix);
         break;
-
-      case TYPE_STRINGLIST:
-        defval=config_setdefault_stringlist(&(cfgoptions[i]), prefix);
+       	case TYPE_UINT64:
+       	case TYPE_INT64:
+             defval=config_setdefault_int64(&(cfgoptions[i]), prefix);
+        break;        
+       	case TYPE_UINTARRAY:
+       	case TYPE_INTARRAY:
+             defval=config_setdefault_intlist(&(cfgoptions[i]), prefix);
         break;
-
-      case TYPE_UINT8:
-      case TYPE_INT8:
-      case TYPE_UINT16:
-      case TYPE_INT16:
-      case TYPE_UINT32:
-      case TYPE_INT32:
-      case TYPE_MASK:
-        defval=config_setdefault_int(&(cfgoptions[i]), prefix);
+       	case TYPE_DOUBLE:
+             defval=config_setdefault_double(&(cfgoptions[i]), prefix);  
+        break;  
+       	case TYPE_IPV4ADDR:
+             defval=config_setdefault_ipv4addr(&(cfgoptions[i]), prefix); 
+              
         break;
-
-      case TYPE_UINT64:
-      case TYPE_INT64:
-        defval=config_setdefault_int64(&(cfgoptions[i]), prefix);
+        default:
+            fprintf(stderr,"[CONFIG] %s.%s type %i  not supported\n",prefix, cfgoptions[i].optname,cfgoptions[i].type);
+            fatalerror=1;
         break;
-
-      case TYPE_UINTARRAY:
-      case TYPE_INTARRAY:
-        defval=config_setdefault_intlist(&(cfgoptions[i]), prefix);
-        break;
-
-      case TYPE_DOUBLE:
-        defval=config_setdefault_double(&(cfgoptions[i]), prefix);
-        break;
-
-      case TYPE_IPV4ADDR:
-        defval=config_setdefault_ipv4addr(&(cfgoptions[i]), prefix);
-        break;
-
-      default:
-        fprintf(stderr,"[CONFIG] %s.%s type %i  not supported\n",prefix, cfgoptions[i].optname,cfgoptions[i].type);
-        fatalerror=1;
-        break;
-    } /* switch on param type */
-
+      } /* switch on param type */
     if (defval == 1) {
-      numdefvals++;
-      cfgoptions[i].paramflags = cfgoptions[i].paramflags |  PARAMFLAG_PARAMSETDEF;
+    	numdefvals++;
+        cfgoptions[i].paramflags = cfgoptions[i].paramflags |  PARAMFLAG_PARAMSETDEF;
     }
   } /* for loop on options */
-
   printf("[CONFIG] %s: %i/%i parameters successfully set \n",
-         ((prefix == NULL)?"(root)":prefix),
+         ((prefix == NULL)?"(root)":prefix), 
          numdefvals,numoptions );
-
   if (fatalerror == 1) {
-    fprintf(stderr,"[CONFIG] fatal errors found when assigning %s parameters \n",
-            prefix);
+      fprintf(stderr,"[CONFIG] fatal errors found when assigning %s parameters \n",
+             prefix);
   }
-
   return numdefvals;
 }
 
-configmodule_interface_t *load_configmodule(int argc, char **argv, uint32_t initflags) {
-  char *cfgparam=NULL;
-  char *modeparams=NULL;
-  char *cfgmode=NULL;
-  char *strtokctx=NULL;
-  char *atoken;
-  uint32_t tmpflags=0;
-  int i;
-  int OoptIdx=-1;
+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 */
+  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 ( strstr(argv[i], "help_config") != NULL  ) {
+          config_printhelp(Config_Params,CONFIG_PARAMLENGTH(Config_Params));
+          exit(0);
+       }
+       if ( (strcmp(argv[i]+1, "h") == 0) || (strstr(argv[i]+1, "help_") != NULL ) ) {
+          tmpflags = CONFIG_HELP; 
+       }            
+   }
 
-  /* first parse the command line to look for the -O option */
-  for (i = 0; i<argc; i++) {
-    if (strlen(argv[i]) < 2) continue;
-
-    if ( argv[i][1] == 'O' && i < (argc -1)) {
-      cfgparam = argv[i+1];
-      OoptIdx=i;
-    }
-
-    if ( strstr(argv[i], "help_config") != NULL  ) {
-      config_printhelp(Config_Params,CONFIG_PARAMLENGTH(Config_Params),CONFIG_SECTIONNAME);
-      exit(0);
-    }
-
-    if ( (strcmp(argv[i]+1, "h") == 0) || (strstr(argv[i]+1, "help_") != NULL ) ) {
-      tmpflags = CONFIG_HELP;
-    }
-  }
-
-  /* look for the OAI_CONFIGMODULE environement variable */
+/* look for the OAI_CONFIGMODULE environement variable */
   if ( cfgparam == NULL ) {
-    cfgparam = getenv("OAI_CONFIGMODULE");
-  }
+     cfgparam = getenv("OAI_CONFIGMODULE");
+     }
 
-  /* default different for UE and softmodem because UE doesn't use config file*/
-  /* and -O option is not mandatory for UE                                    */
-  /* phy simulators behave as UE                                              */
-  /* test of exec name would better be replaced by a parameter to the l       */
-  /* oad_configmodule function */
+/* default */
   if (cfgparam == NULL) {
-    tmpflags = tmpflags | CONFIG_NOOOPT;
+         tmpflags = tmpflags | CONFIG_NOOOPT;
+     if (strstr(argv[0],"uesoftmodem") == NULL) {
+         cfgparam = CONFIG_LIBCONFIGFILE ":" DEFAULT_CFGFILENAME;
+      } else {
+         cfgparam = CONFIG_CMDLINEONLY ":dbgl0" ;         
+      }
+   }
+   
+/* 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));
+       exit(-1);
+   }
+   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(CONFIG_LIBCONFIGFILE);
+   }
 
-    if ( initflags &  CONFIG_ENABLECMDLINEONLY) {
-      cfgparam = CONFIG_CMDLINEONLY ":dbgl0" ;
-    } else {
-      cfgparam = CONFIG_CMDLINEONLY ":dbgl0" ;
-      cfgparam = CONFIG_LIBCONFIGFILE ":" DEFAULT_CFGFILENAME;
-    }
-  }
+   cfgptr = malloc(sizeof(configmodule_interface_t));
+   memset(cfgptr,0,sizeof(configmodule_interface_t));
 
-  /* parse the config parameters to set the config source */
-  i = sscanf(cfgparam,"%m[^':']:%ms",&cfgmode,&modeparams);
+   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);
 
-  if (i< 0) {
-    fprintf(stderr,"[CONFIG] %s, %d, sscanf error parsing config source  %s: %s\n", __FILE__, __LINE__,cfgparam, strerror(errno));
-    exit(-1) ;
-  } 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 cfgmode must not be NULL */
-    modeparams=cfgmode;
-    cfgmode=strdup(CONFIG_LIBCONFIGFILE);
-  }
+       } else {
+           cfgptr->cfgP[cfgptr->num_cfgP] = strdup(atoken);
+           cfgptr->num_cfgP++;
+       }
+       atoken = strtok_r(NULL,":",&strtokctx);
+   }
 
-  cfgptr = calloc(sizeof(configmodule_interface_t),1);
-  cfgptr->argv_info = calloc(sizeof(int32_t), argc);
-  cfgptr->argv_info[0] |= CONFIG_CMDLINEOPT_PROCESSED;
+   
+   printf("[CONFIG] get parameters from %s ",cfgmode);
+   for (i=0;i<cfgptr->num_cfgP; i++) {
+        printf("%s ",cfgptr->cfgP[i]); 
+   }
+   printf(", debug flags: 0x%08x\n",cfgptr->rtflags);
 
-  if (OoptIdx >= 0) {
-    cfgptr->argv_info[OoptIdx] |= CONFIG_CMDLINEOPT_PROCESSED;
-    cfgptr->argv_info[OoptIdx+1] |= CONFIG_CMDLINEOPT_PROCESSED;
-  }
+   if (strstr(cfgparam,CONFIG_CMDLINEONLY) == NULL) {
+      i=load_config_sharedlib(cfgptr);
+      if (i ==  0) {
+         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 );
+      } else {
+         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 {
+      cfgptr->init = (configmodule_initfunc_t)nooptfunc;
+      cfgptr->get = config_cmdlineonly_get;
+      cfgptr->getlist = config_cmdlineonly_getlist;
+      cfgptr->end = (configmodule_endfunc_t)nooptfunc;
+   }
 
-  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(", debug flags: 0x%08x\n",cfgptr->rtflags);
-
-  if (strstr(cfgparam,CONFIG_CMDLINEONLY) == NULL) {
-    i=load_config_sharedlib(cfgptr);
-
-    if (i ==  0) {
-      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 );
-    } else {
-      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 {
-    cfgptr->init = (configmodule_initfunc_t)nooptfunc;
-    cfgptr->get = config_cmdlineonly_get;
-    cfgptr->getlist = config_cmdlineonly_getlist;
-    cfgptr->end = (configmodule_endfunc_t)nooptfunc;
-  }
-
-  if (modeparams != NULL) free(modeparams);
-
-  if (cfgmode != NULL) free(cfgmode);
-
-  if (CONFIG_ISFLAGSET(CONFIG_ABORT)) {
-    config_printhelp(Config_Params,CONFIG_PARAMLENGTH(Config_Params),CONFIG_SECTIONNAME );
-    //       exit(-1);
-  }
-
-  return cfgptr;
+   if (modeparams != NULL) free(modeparams);
+   if (cfgmode != NULL) free(cfgmode);
+   if (CONFIG_ISFLAGSET(CONFIG_ABORT)) {
+       config_printhelp(Config_Params,CONFIG_PARAMLENGTH(Config_Params));
+//       exit(-1);   
+   }
+   return cfgptr;
 }
 
 
 /* free memory allocated when reading parameters */
 /* config module could be initialized again after this call */
-void end_configmodule(void) {
+void end_configmodule(void)
+{ 
   if (cfgptr != NULL) {
-    if (cfgptr->end != NULL) {
-      printf ("[CONFIG] calling config module end function...\n");
-      cfgptr->end();
-    }
-
-    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;
+      if (cfgptr->end != NULL) {
+         printf ("[CONFIG] calling config module end function...\n"); 
+         cfgptr->end();
       }
-    }
 
-    cfgptr->numptrs=0;
+      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;
+          }
+      }
+      cfgptr->numptrs=0;
   }
 }
 
 /* free all memory used by config module */
 /* should be called only at program exit */
-void free_configmodule(void) {
+void free_configmodule(void)
+{ 
   if (cfgptr != NULL) {
-    end_configmodule();
+      end_configmodule();
+      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]);
+          }
 
-    if( cfgptr->cfgmode != NULL) free(cfgptr->cfgmode);
 
-    printf ("[CONFIG] free %i 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]);
-    }
-
-    free(cfgptr);
-    cfgptr=NULL;
+  free(cfgptr);
+  cfgptr=NULL;
   }
 }
 

common/config/config_load_configmodule.h

@@ -20,8 +20,8 @@
  */
 
 /*! \file common/config/config_load_configmodule.h
- * \brief: configuration module, include file to be used by the source code calling the
- *  configuration module initialization
+ * \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
@@ -31,13 +31,12 @@
  * \warning
  */
 #ifndef INCLUDE_CONFIG_LOADCONFIGMODULE_H
-#define INCLUDE_CONFIG_LOADCONFIGMODULE_H
+#define INCLUDE_CONFIG_LOADCONFIGMODULE_H 
 
 
 #include <string.h>
 #include <stdlib.h>
 #include "common/config/config_paramdesc.h"
-#include "common/utils/T/T.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
 
@@ -45,13 +44,12 @@
 #define CONFIG_LIBCONFIGFILE        "libconfig"  // use libconfig file
 #define CONFIG_CMDLINEONLY          "cmdline"    // use only command line options
 #define DEFAULT_CFGFILENAME         "oai.conf"   // default config file
-/*   bit position definition for the argv_info mask of the configmodule_interface_t structure */
-#define CONFIG_CMDLINEOPT_PROCESSED    (1<<0)   // command line option has been processed
-/*  bit position definitions for the rtflags mask of the configmodule_interface_t structure*/
+
+/* rtflags bit position definitions */
 #define CONFIG_PRINTPARAMS    1                 // print parameters values while processing
 #define CONFIG_DEBUGPTR       (1<<1)            // print memory allocation/free debug messages
 #define CONFIG_DEBUGCMDLINE   (1<<2)            // print command line processing messages
-#define CONFIG_NOABORTONCHKF  (1<<4)            // disable abort execution when parameter checking function fails
+#define CONFIG_NOABORTONCHKF  (1<<3)            // disable abort execution when parameter checking function fails
 #define CONFIG_NOEXITONHELP   (1<<19)           // do not exit after printing help
 #define CONFIG_HELP           (1<<20)           // print help message
 #define CONFIG_ABORT          (1<<21)           // config failed,abort execution 
@@ -60,10 +58,10 @@ 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 {
+typedef struct configmodule_interface
+{
   int      argc;
   char     **argv;
-  uint32_t *argv_info;
   char     *cfgmode;
   int      num_cfgP;
   char     *cfgP[CONFIG_MAX_OOPT_PARAMS];
@@ -73,7 +71,7 @@ typedef struct configmodule_interface {
   configmodule_endfunc_t          end;
   uint32_t numptrs;
   uint32_t rtflags;
-  char     *ptrs[CONFIG_MAX_ALLOCATEDPTRS];
+  char     *ptrs[CONFIG_MAX_ALLOCATEDPTRS];  
 } configmodule_interface_t;
 
 #ifdef CONFIG_LOADCONFIG_MAIN
@@ -83,17 +81,17 @@ static char config_helpstr [] = "\n lte-softmodem -O [config mode]<:dbgl[debugfl
           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},
+/*-----------------------------------------------------------------------------------------------------------------------*/
+/*                                            config parameters for config module                                        */
+/*   optname              helpstr           paramflags     XXXptr       defXXXval            type       numelt           */
+/*-----------------------------------------------------------------------------------------------------------------------*/
+{"debugflags",            config_helpstr,   0,             uptr:NULL,   defintval:0,        TYPE_MASK,  0}, 
 };
 
 #else
@@ -102,13 +100,10 @@ extern configmodule_interface_t *cfgptr;
 
 
 #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_ptrs(...)   if ( (cfgptr->rtflags & (CONFIG_DEBUGPTR)) != 0 )     { printf ( __VA_ARGS__ ); }     
 #define printf_cmdl(...)   if ( (cfgptr->rtflags & (CONFIG_DEBUGCMDLINE)) != 0 ) { printf ( __VA_ARGS__ ); }
-
-#define CONFIG_ENABLECMDLINEONLY  (1<<1)
-extern configmodule_interface_t *load_configmodule(int argc, char **argv, uint32_t initflags);
+ 
+extern configmodule_interface_t *load_configmodule(int argc, char **argv);
 extern void end_configmodule(void);
-#define CONFIG_PRINTF_ERROR(f, x... ) if (isLogInitDone ()) { LOG_E(ENB_APP,f,x);} else {printf(f,x);}; if ( !CONFIG_ISFLAGSET(CONFIG_NOABORTONCHKF) ) exit_fun("exit because configuration failed\n");
-
 
 #endif  /* INCLUDE_CONFIG_LOADCONFIGMODULE_H */

common/config/config_paramdesc.h

@@ -38,7 +38,7 @@
 
 
 #define MAX_OPTNAME_SIZE 64
-#define CONFIG_MAXOPTLENGTH 512 /* max full option length, full option name exemple: (prefix1.[<index>].prefix2.optname */
+
 
 
 /* parameter flags definitions */
@@ -55,81 +55,83 @@
 #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
 
+
 /* checkedparam_t is possibly used in paramdef_t for specific parameter value validation */
 #define CONFIG_MAX_NUMCHECKVAL            20
 typedef struct paramdef paramdef_t;
 typedef union checkedparam {
-  struct  {
-    int  (*f1)(paramdef_t *param);   /* check an integer against a list of authorized values */
-    int okintval[CONFIG_MAX_NUMCHECKVAL];                        /* integer array, store possible values  */
-    int num_okintval;                                            /* number of valid values in the checkingval array */
-  } s1;
-  struct  {
-    int  (*f1a)(paramdef_t *param);   /* check an integer against a list of authorized values and set param value */
-    /* to the corresponding item in setintval array (mainly for RRC params)     */
-    int okintval[CONFIG_MAX_NUMCHECKVAL];                        /* integer array, store possible values in config file */
-    int setintval[CONFIG_MAX_NUMCHECKVAL];                        /* integer array, values set in the paramdef structure */
-    int num_okintval;                                            /* number of valid values in the checkingval array */
-  } s1a;
-  struct {
-    int  (*f2)(paramdef_t *param);  /* check an integer against an authorized range, defined by its min and max value */
-    int okintrange[CONFIG_MAX_NUMCHECKVAL];  /* integer array, store  min and max values  */
-
-  } s2;
-  struct {
-    int  (*f3)(paramdef_t *param); /* check a string against a list of authorized values */
-    char *okstrval[CONFIG_MAX_NUMCHECKVAL];                      /* string array, store possible values  */
-    int  num_okstrval;                                           /* number of valid values in the checkingval array */
-  } s3;
-  struct {
-    int  (*f3a)(paramdef_t *param); /* check a string against a list of authorized values and set param value */
-    /* to the corresponding item in setintval array (mainly for RRC params) */
-    char *okstrval[CONFIG_MAX_NUMCHECKVAL];                      /* string array, store possible values  */
-    int  setintval[CONFIG_MAX_NUMCHECKVAL];                      /* integer array, values set in the paramdef structure */
-    int  num_okstrval;                                           /* number of valid values in the checkingval array */
-  } s3a;
-  struct {
-    int  (*f4)(paramdef_t *param); /* generic check function, no arguments but the param description */
-
-  } s4;
-  struct {
-    void (*checkfunc)(void) ;
-  } s5;
+        struct  { 
+               int  (*f1)(paramdef_t *param);   /* check an integer against a list of authorized values */
+               int okintval[CONFIG_MAX_NUMCHECKVAL];                        /* integer array, store possible values  */
+               int num_okintval;                                            /* number of valid values in the checkingval array */
+        } s1;
+        struct  { 
+               int  (*f1a)(paramdef_t *param);   /* check an integer against a list of authorized values and set param value */
+                                                 /* to the corresponding item in setintval array (mainly for RRC params)     */
+               int okintval[CONFIG_MAX_NUMCHECKVAL];                        /* integer array, store possible values in config file */
+               int setintval[CONFIG_MAX_NUMCHECKVAL];                        /* integer array, values set in the paramdef structure */
+               int num_okintval;                                            /* number of valid values in the checkingval array */
+        } s1a;
+        struct { 
+               int  (*f2)(paramdef_t *param);  /* check an integer against an authorized range, defined by its min and max value */
+               int okintrange[CONFIG_MAX_NUMCHECKVAL];  /* integer array, store  min and max values  */
+   
+        } s2;
+        struct {
+               int  (*f3)(paramdef_t *param); /* check a string against a list of authorized values */
+               char *okstrval[CONFIG_MAX_NUMCHECKVAL];                      /* string array, store possible values  */
+               int  num_okstrval;                                           /* number of valid values in the checkingval array */
+        } s3;
+        struct {
+               int  (*f3a)(paramdef_t *param); /* check a string against a list of authorized values and set param value */
+                                                 /* to the corresponding item in setintval array (mainly for RRC params) */
+               char *okstrval[CONFIG_MAX_NUMCHECKVAL];                      /* string array, store possible values  */
+               int  setintval[CONFIG_MAX_NUMCHECKVAL];                      /* integer array, values set in the paramdef structure */
+               int  num_okstrval;                                           /* number of valid values in the checkingval array */
+        } s3a;
+        struct {
+               int  (*f4)(paramdef_t *param); /* generic check function, no arguments but the param description */
+               
+        } s4;
+        struct { 
+                void (*checkfunc)(void) ; 
+        } s5;
 } checkedparam_t;
 
 /* paramdef is used to describe a parameter, array of paramdef_t strustures is used as the main parameter in */
 /* config apis used to retrieve parameters values  */
-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;
-    int8_t    *i8ptr;
-    uint16_t  *u16ptr;
-    int16_t   *i16ptr;
-    uint32_t  *uptr;
-    int32_t   *iptr;
-    uint64_t  *u64ptr;
-    int64_t   *i64ptr;
-    double    *dblptr;
-    void      *voidptr;
-  } ;
-  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 */
-  checkedparam_t   *chkPptr;              /* possible pointer to the structure containing the info used to check parameter values */
-  int *processedvalue;                    /* used to store integer values computed from string original value */
+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;
+     int8_t    *i8ptr;     
+     uint16_t  *u16ptr;
+     int16_t   *i16ptr;
+     uint32_t  *uptr;
+     int32_t   *iptr;
+     uint64_t  *u64ptr;
+     int64_t   *i64ptr;
+     double    *dblptr;
+     void      *voidptr;
+     } ;
+   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 */ 
+   checkedparam_t   *chkPptr;              /* possible pointer to the structure containing the info used to check parameter values */
+   int *processedvalue;                    /* used to store integer values computed from string original value */
 } paramdef_t;
 
 #define TYPE_INT        TYPE_INT32
@@ -159,9 +161,9 @@ typedef struct paramdef {
 #define ANY_IPV4ADDR_STRING "0.0.0.0"
 
 typedef struct paramlist_def {
-  char listname[MAX_OPTNAME_SIZE];
-  paramdef_t **paramarray;
-  int numelt ;
+    char listname[MAX_OPTNAME_SIZE];
+    paramdef_t **paramarray;
+    int numelt ;
 } paramlist_def_t;
 
 /* macro helpers for module users */

common/config/config_userapi.c

@@ -39,453 +39,414 @@
 #include <errno.h>
 #include <dlfcn.h>
 #include <arpa/inet.h>
+
 #include <platform_types.h>
 #include "config_userapi.h"
-#include "../utils/LOG/log.h"
 
-configmodule_interface_t *config_get_if(void) {
-  if (cfgptr == NULL) {
-    CONFIG_PRINTF_ERROR("[CONFIG] %s %d config module not initialized\n",__FILE__,__LINE__);
-  }
 
-  return cfgptr;
+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) {
-  if (ptr == NULL ) {
-    ptr = malloc(sizeof(char *));
+char * config_check_valptr(paramdef_t *cfgoptions, char **ptr, int length) 
+{
+     if (ptr == NULL ) {
+        ptr = malloc(sizeof(char *));
+        if (ptr != NULL) {
+            *ptr=NULL;
+            cfgoptions->strptr=ptr;
+            if ( (cfgoptions->paramflags & PARAMFLAG_NOFREE) == 0) {
+            	config_get_if()->ptrs[config_get_if()->numptrs] = (char *)ptr;
+            	config_get_if()->numptrs++;
+            }
+        } else {		 
+            fprintf(stderr, "[CONFIG] %s %d option %s, cannot allocate pointer: %s \n", 
+                    __FILE__, __LINE__, cfgoptions->optname, strerror(errno));
+            exit(-1);
+        }         
+     }
+     printf_ptrs("[CONFIG] %s ptr: 0x%08lx requested size: %i\n",cfgoptions->optname,(uintptr_t)(ptr),length);
+     if(cfgoptions->numelt > 0 && PARAM_ISSCALAR(cfgoptions)  ) { /* already allocated */
+          if (*ptr != NULL) {
+              return *ptr;
+          } else {
+              fprintf(stderr,"[CONFIG] %s %d option %s, definition error: value pointer is NULL, declared as %i bytes allocated\n", 
+                       __FILE__, __LINE__,cfgoptions->optname, cfgoptions->numelt);
+              exit(-1);
+          }
+     }
 
-    if (ptr != NULL) {
-      *ptr=NULL;
-      cfgoptions->strptr=ptr;
-
-      if ( (cfgoptions->paramflags & PARAMFLAG_NOFREE) == 0) {
-        config_get_if()->ptrs[config_get_if()->numptrs] = (char *)ptr;
-        config_get_if()->numptrs++;
-      }
-    } else {
-      CONFIG_PRINTF_ERROR("[CONFIG] %s %d option %s, cannot allocate pointer: %s \n",
-                          __FILE__, __LINE__, cfgoptions->optname, strerror(errno));
-    }
-  }
-
-  printf_ptrs("[CONFIG] %s ptr: 0x%08lx requested size: %i\n",cfgoptions->optname,(uintptr_t)(ptr),length);
-
-  if(cfgoptions->numelt > 0 && PARAM_ISSCALAR(cfgoptions)  ) { /* already allocated */
-    if (*ptr != NULL) {
-      return *ptr;
-    } else {
-      CONFIG_PRINTF_ERROR("[CONFIG] %s %d option %s, definition error: value pointer is NULL, declared as %i bytes allocated\n",
-                          __FILE__, __LINE__,cfgoptions->optname, cfgoptions->numelt);
-    }
-  }
-
-  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 {
-      CONFIG_PRINTF_ERROR("[CONFIG] %s %d malloc error\n",__FILE__, __LINE__);
-    }
-  }
-
-  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;
-
+void config_assign_int(paramdef_t *cfgoptions, char *fullname, int val)
+{
+int tmpval=val;
   if ( ((cfgoptions->paramflags &PARAMFLAG_BOOL) != 0) && tmpval >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;
+       	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_assign_processedint(paramdef_t *cfgoption, int val) {
-  cfgoption->processedvalue = malloc(sizeof(int));
-
-  if (  cfgoption->processedvalue != NULL) {
-    *(cfgoption->processedvalue) = val;
-  } else {
-    CONFIG_PRINTF_ERROR("[CONFIG] %s %d malloc error\n",__FILE__, __LINE__);
-  }
+        cfgoption->processedvalue = malloc(sizeof(int));
+        if (  cfgoption->processedvalue != NULL) {
+             *(cfgoption->processedvalue) = val;
+        } else {
+             fprintf (stderr,"[CONFIG] %s %d malloc error\n",__FILE__, __LINE__);
+             exit(-1);
+        }            
 }
 
 int config_get_processedint(paramdef_t *cfgoption) {
-  int ret;
-
-  if (  cfgoption->processedvalue != NULL) {
-    ret=*(cfgoption->processedvalue);
-    free( cfgoption->processedvalue);
-    cfgoption->processedvalue=NULL;
-    printf_params("[CONFIG] %s:  set from %s to %i\n",cfgoption->optname, *(cfgoption->strptr), ret);
-  } else {
-    fprintf (stderr,"[CONFIG] %s %d %s has no processed integer availablle\n",__FILE__, __LINE__, cfgoption->optname);
-    ret=0;
-  }
-
-  return ret;
+   int ret;
+        if (  cfgoption->processedvalue != NULL) {
+             ret=*(cfgoption->processedvalue);
+             free( cfgoption->processedvalue);
+             cfgoption->processedvalue=NULL;
+             printf_params("[CONFIG] %s:  set from %s to %i\n",cfgoption->optname, *(cfgoption->strptr), ret);
+        } else {
+             fprintf (stderr,"[CONFIG] %s %d %s has no processed integer availablle\n",__FILE__, __LINE__, cfgoption->optname);
+             ret=0;
+        }
+return ret;            
 }
-void config_printhelp(paramdef_t *params,int numparams, char *prefix) {
-  printf("\n-----Help for section %-26s: %03i entries------\n",(prefix==NULL)?"(root section)":prefix ,numparams);
-
-  for (int i=0 ; i<numparams ; i++) {
-    printf("    %s%s: %s",
-           (strlen(params[i].optname) <= 1) ? "-" : "--",
-           params[i].optname,
-           (params[i].helpstr != NULL)?params[i].helpstr:"Help string not specified\n");
-  }   /* for on params entries */
-
-  printf("--------------------------------------------------------------------\n\n");
+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_execcheck(paramdef_t *params,int numparams, char *prefix) {
-  int st=0;
+int config_execcheck(paramdef_t *params,int numparams, char *prefix)
+{
+int st=0;
 
-  for (int i=0 ; i<numparams ; i++) {
-    if ( params[i].chkPptr == NULL) {
-      continue;
-    }
-
-    if (params[i].chkPptr->s4.f4 != NULL) {
-      st += params[i].chkPptr->s4.f4(&(params[i]));
-    }
-  }
-
-  if (st != 0) {
-    CONFIG_PRINTF_ERROR("[CONFIG] config_execcheck: section %s %i parameters with wrong value\n", prefix, -st);
-  }
-
-  return st;
+   for (int i=0 ; i<numparams ; i++) {
+       if ( params[i].chkPptr == NULL) {
+           continue;
+       }
+       if (params[i].chkPptr->s4.f4 != NULL) {
+         st += params[i].chkPptr->s4.f4(&(params[i]));
+       }
+   }
+   if (st != 0) {
+      fprintf(stderr,"[CONFIG] config_execcheck: section %s %i parameters with wrong value\n", prefix, -st); 
+      if ( CONFIG_ISFLAGSET(CONFIG_NOABORTONCHKF) == 0) {
+          exit_fun("exit because configuration failed\n");
+      }
+   }
+return st;
 }
 
-int config_get(paramdef_t *params,int numparams, char *prefix) {
-  int ret= -1;
+int config_get(paramdef_t *params,int numparams, char *prefix)
+{
+int ret= -1;
 
-  if (CONFIG_ISFLAGSET(CONFIG_ABORT)) {
+if (CONFIG_ISFLAGSET(CONFIG_ABORT)) {
     fprintf(stderr,"[CONFIG] config_get, section %s skipped, config module not properly initialized\n",prefix);
     return ret;
-  }
-
-  configmodule_interface_t *cfgif = config_get_if();
-
+}
+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);
-      config_execcheck(params,numparams,prefix);
-    }
-
-    return ret;
-  }
-
+      ret = config_get_if()->get(params, numparams,prefix);
+      if (ret >= 0) {
+         config_process_cmdline(params,numparams,prefix);
+         config_execcheck(params,numparams,prefix);
+     }
   return ret;
+  }
+return ret;
 }
 
-int config_getlist(paramlist_def_t *ParamList, paramdef_t *params, int numparams, char *prefix) {
+int config_getlist(paramlist_def_t *ParamList, paramdef_t *params, int numparams, char *prefix)
+{
   if (CONFIG_ISFLAGSET(CONFIG_ABORT)) {
     fprintf(stderr,"[CONFIG] config_get skipped, config module not properly initialized\n");
     return -1;
   }
-
   if (!config_get_if())
     return -1;
 
   const int ret = config_get_if()->getlist(ParamList, params, numparams, prefix);
-
   if (ret >= 0 && params) {
     char *newprefix;
-
     if (prefix) {
       int rc = asprintf(&newprefix, "%s.%s", prefix, ParamList->listname);
-
       if (rc < 0) newprefix = NULL;
     } else {
       newprefix = ParamList->listname;
     }
-
     char cfgpath[MAX_OPTNAME_SIZE*2 + 6]; /* prefix.listname.[listindex] */
-
     for (int i = 0; i < ParamList->numelt; ++i) {
       // TODO config_process_cmdline?
       sprintf(cfgpath, "%s.[%i]", newprefix, i);
-      config_process_cmdline(ParamList->paramarray[i],numparams,cfgpath);
       config_execcheck(ParamList->paramarray[i], numparams, cfgpath);
     }
-
     if (prefix)
       free(newprefix);
   }
-
   return ret;
 }
 
-int config_isparamset(paramdef_t *params,int paramidx) {
+int config_isparamset(paramdef_t *params,int paramidx)
+{
   if ((params[paramidx].paramflags & PARAMFLAG_PARAMSET) != 0) {
-    return 1;
+      return 1;
   } else {
-    return 0;
+      return 0;
   }
 }
 
 void print_intvalueerror(paramdef_t *param, char *fname, int *okval, int numokval) {
-  fprintf(stderr,"[CONFIG] %s: %s: %i invalid value, authorized values:\n       ",
-          fname,param->optname, (int)*(param->uptr));
-
-  for ( int i=0; i<numokval ; i++) {
-    fprintf(stderr, " %i",okval[i]);
-  }
-
-  fprintf(stderr, " \n");
+    fprintf(stderr,"[CONFIG] %s: %s: %i invalid value, authorized values:\n       ",
+           fname,param->optname, (int)*(param->uptr));
+    for ( int i=0; i<numokval ; i++) {
+         fprintf(stderr, " %i",okval[i]);
+         }
+    fprintf(stderr, " \n");
 }
-
-int config_check_intval(paramdef_t *param) {
-  if ( param == NULL ) {
-    fprintf(stderr,"[CONFIG] config_check_intval: NULL param argument\n");
+ 
+int config_check_intval(paramdef_t *param)
+{
+    if ( param == NULL ){
+       fprintf(stderr,"[CONFIG] config_check_intval: NULL param argument\n");
+       return -1;
+    }
+    for ( int i=0; i<param->chkPptr->s1.num_okintval ; i++) {
+         if( *(param->uptr) == param->chkPptr->s1.okintval[i] ) {
+             return 0;
+         }
+    }
+    print_intvalueerror(param,"config_check_intval", param->chkPptr->s1.okintval,param->chkPptr->s1.num_okintval);
     return -1;
-  }
-
-  for ( int i=0; i<param->chkPptr->s1.num_okintval ; i++) {
-    if( *(param->uptr) == param->chkPptr->s1.okintval[i] ) {
-      return 0;
-    }
-  }
-
-  print_intvalueerror(param,"config_check_intval", param->chkPptr->s1.okintval,param->chkPptr->s1.num_okintval);
-  return -1;
 }
 
-int config_check_modify_integer(paramdef_t *param) {
-  for (int i=0; i < param->chkPptr->s1a.num_okintval ; i++) {
-    if (*(param->uptr) == param->chkPptr->s1a.okintval[i] ) {
-      printf_params("[CONFIG] %s:  read value %i, set to %i\n",param->optname,*(param->uptr),param->chkPptr->s1a.setintval [i]);
-      *(param->uptr) = param->chkPptr->s1a.setintval [i];
-      return 0;
-    }
-  }
-
-  print_intvalueerror(param,"config_check_modify_integer", param->chkPptr->s1a.okintval,param->chkPptr->s1a.num_okintval);
-  return -1;
+int config_check_modify_integer(paramdef_t *param)
+{
+   
+    for (int i=0; i < param->chkPptr->s1a.num_okintval ; i++) {
+    	if (*(param->uptr) == param->chkPptr->s1a.okintval[i] ) {
+            printf_params("[CONFIG] %s:  read value %i, set to %i\n",param->optname,*(param->uptr),param->chkPptr->s1a.setintval [i]);
+    	    *(param->uptr) = param->chkPptr->s1a.setintval [i];
+    	    return 0; 
+    	}
+   }
+    print_intvalueerror(param,"config_check_modify_integer", param->chkPptr->s1a.okintval,param->chkPptr->s1a.num_okintval);
+    return -1;
 }
 
-int config_check_intrange(paramdef_t *param) {
-  if( *(param->iptr) >= param->chkPptr->s2.okintrange[0]  && *(param->iptr) <= param->chkPptr->s2.okintrange[1]  ) {
-    return 0;
-  }
-
-  fprintf(stderr,"[CONFIG] config_check_intrange: %s: %i invalid value, authorized range: %i %i\n",
-          param->optname, (int)*(param->uptr), param->chkPptr->s2.okintrange[0], param->chkPptr->s2.okintrange[1]);
-  return -1;
+int config_check_intrange(paramdef_t *param)
+{
+   if( *(param->iptr) >= param->chkPptr->s2.okintrange[0]  && *(param->iptr) <= param->chkPptr->s2.okintrange[1]  ) {
+       return 0;
+   }
+   fprintf(stderr,"[CONFIG] config_check_intrange: %s: %i invalid value, authorized range: %i %i\n",
+           param->optname, (int)*(param->uptr), param->chkPptr->s2.okintrange[0], param->chkPptr->s2.okintrange[1]);
+   return -1;
 }
 
 void print_strvalueerror(paramdef_t *param, char *fname, char **okval, int numokval) {
-  fprintf(stderr,"[CONFIG] %s: %s: %s invalid value, authorized values:\n       ",
-          fname,param->optname, *(param->strptr));
-
-  for ( int i=0; i<numokval ; i++) {
-    fprintf(stderr, " %s",okval[i]);
-  }
-
-  fprintf(stderr, " \n");
+    fprintf(stderr,"[CONFIG] %s: %s: %s invalid value, authorized values:\n       ",
+           fname,param->optname, *(param->strptr));
+    for ( int i=0; i<numokval ; i++) {
+         fprintf(stderr, " %s",okval[i]);
+         }
+    fprintf(stderr, " \n");
 }
-
-int config_check_strval(paramdef_t *param) {
-  if ( param == NULL ) {
-    fprintf(stderr,"[CONFIG] config_check_strval: NULL param argument\n");
+ 
+int config_check_strval(paramdef_t *param)
+{
+    if ( param == NULL ){
+       fprintf(stderr,"[CONFIG] config_check_strval: NULL param argument\n");
+       return -1;
+    }
+    for ( int i=0; i<param->chkPptr->s3.num_okstrval ; i++) {
+         if( strcasecmp(*(param->strptr),param->chkPptr->s3.okstrval[i] ) == 0) {
+             return 0;
+         }
+    }
+    print_strvalueerror(param, "config_check_strval", param->chkPptr->s3.okstrval, param->chkPptr->s3.num_okstrval);
     return -1;
-  }
-
-  for ( int i=0; i<param->chkPptr->s3.num_okstrval ; i++) {
-    if( strcasecmp(*(param->strptr),param->chkPptr->s3.okstrval[i] ) == 0) {
-      return 0;
-    }
-  }
-
-  print_strvalueerror(param, "config_check_strval", param->chkPptr->s3.okstrval, param->chkPptr->s3.num_okstrval);
-  return -1;
 }
 
-int config_checkstr_assign_integer(paramdef_t *param) {
-  for (int i=0; i < param->chkPptr->s3a.num_okstrval ; i++) {
-    if (strcasecmp(*(param->strptr),param->chkPptr->s3a.okstrval[i]  ) == 0) {
-      config_assign_processedint(param, param->chkPptr->s3a.setintval[i]);
-      return 0;
-    }
-  }
+int config_checkstr_assign_integer(paramdef_t *param)
+{
 
-  print_strvalueerror(param, "config_check_strval", param->chkPptr->s3a.okstrval, param->chkPptr->s3a.num_okstrval);
-  return -1;
+
+    for (int i=0; i < param->chkPptr->s3a.num_okstrval ; i++) {
+    	if (strcasecmp(*(param->strptr),param->chkPptr->s3a.okstrval[i]  ) == 0) {
+            config_assign_processedint(param, param->chkPptr->s3a.setintval[i]);
+    	    return 0; 
+    	}
+   }
+   print_strvalueerror(param, "config_check_strval", param->chkPptr->s3a.okstrval, param->chkPptr->s3a.num_okstrval);
+
+    return -1;
 }
 
-void config_set_checkfunctions(paramdef_t *params, checkedparam_t *checkfunctions, int numparams) {
-  for (int i=0; i< numparams ; i++ ) {
-    params[i].chkPptr = &(checkfunctions[i]);
-  }
-}
-
-int config_setdefault_string(paramdef_t *cfgoptions, char *prefix) {
+int config_setdefault_string(paramdef_t *cfgoptions, char *prefix)
+{
   int status = 0;
-
   if( cfgoptions->defstrval != NULL) {
-    status=1;
+     status=1;
 
-    if (cfgoptions->numelt == 0 ) {
-      config_check_valptr(cfgoptions, (char **)(cfgoptions->strptr), sizeof(char *));
-      config_check_valptr(cfgoptions, cfgoptions->strptr, strlen(cfgoptions->defstrval)+1);
-      sprintf(*(cfgoptions->strptr), "%s",cfgoptions->defstrval);
-      printf_params("[CONFIG] %s.%s set to default value \"%s\"\n", ((prefix == NULL) ? "" : prefix), cfgoptions->optname, *(cfgoptions->strptr));
-    } else {
-      sprintf((char *)*(cfgoptions->strptr), "%s",cfgoptions->defstrval);
-      printf_params("[CONFIG] %s.%s set to default value \"%s\"\n", ((prefix == NULL) ? "" : prefix), cfgoptions->optname, (char *)*(cfgoptions->strptr));
-    }
+     if (cfgoptions->numelt == 0 ) {
+	 config_check_valptr(cfgoptions, (char **)(cfgoptions->strptr), sizeof(char *));
+	 config_check_valptr(cfgoptions, cfgoptions->strptr, strlen(cfgoptions->defstrval)+1);
+	 sprintf(*(cfgoptions->strptr), "%s",cfgoptions->defstrval);
+	 printf_params("[CONFIG] %s.%s set to default value \"%s\"\n", ((prefix == NULL) ? "" : prefix), cfgoptions->optname, *(cfgoptions->strptr));
+     } else {
+	sprintf((char *)*(cfgoptions->strptr), "%s",cfgoptions->defstrval);
+	printf_params("[CONFIG] %s.%s set to default value \"%s\"\n", ((prefix == NULL) ? "" : prefix), cfgoptions->optname, (char *)*(cfgoptions->strptr));
+     }
   }
-
   return status;
 }
 
-int config_setdefault_stringlist(paramdef_t *cfgoptions, char *prefix) {
+int config_setdefault_stringlist(paramdef_t *cfgoptions, char *prefix)
+{
   int status = 0;
-
   if( cfgoptions->defstrlistval != NULL) {
-    cfgoptions->strlistptr=cfgoptions->defstrlistval;
-    status=1;
-
-    for(int j=0; j<cfgoptions->numelt; j++)
-      printf_params("[CONFIG] %s.%s[%i] set to default value %s\n", ((prefix == NULL) ? "" : prefix), cfgoptions->optname,j, cfgoptions->strlistptr[j]);
+     cfgoptions->strlistptr=cfgoptions->defstrlistval;
+     status=1;
+     for(int j=0; j<cfgoptions->numelt; j++)
+  	 printf_params("[CONFIG] %s.%s[%i] set to default value %s\n", ((prefix == NULL) ? "" : prefix), cfgoptions->optname,j, cfgoptions->strlistptr[j]);
   }
-
   return status;
 }
 
-int config_setdefault_int(paramdef_t *cfgoptions, char *prefix) {
+int config_setdefault_int(paramdef_t *cfgoptions, char *prefix)
+{
   int status = 0;
   config_check_valptr(cfgoptions, (char **)(&(cfgoptions->iptr)),sizeof(int32_t));
-
   if( ((cfgoptions->paramflags & PARAMFLAG_MANDATORY) == 0)) {
-    config_assign_int(cfgoptions,cfgoptions->optname,cfgoptions->defintval);
-    status=1;
-    printf_params("[CONFIG] %s.%s set to default value\n", ((prefix == NULL) ? "" : prefix), cfgoptions->optname);
+     config_assign_int(cfgoptions,cfgoptions->optname,cfgoptions->defintval);
+     status=1;
+     printf_params("[CONFIG] %s.%s set to default value\n", ((prefix == NULL) ? "" : prefix), cfgoptions->optname);
   }
-
   return status;
-}
+}	
 
-int config_setdefault_int64(paramdef_t *cfgoptions, char *prefix) {
+int config_setdefault_int64(paramdef_t *cfgoptions, char *prefix)
+{
   int status = 0;
   config_check_valptr(cfgoptions, (char **)&(cfgoptions->i64ptr),sizeof(long long));
-
   if( ((cfgoptions->paramflags & PARAMFLAG_MANDATORY) == 0)) {
-    *(cfgoptions->u64ptr)=cfgoptions->defuintval;
-    status=1;
-    printf_params("[CONFIG] %s.%s set to default value %llu\n", ((prefix == NULL) ? "" : prefix), cfgoptions->optname, (long long unsigned)(*(cfgoptions->u64ptr)));
+     *(cfgoptions->u64ptr)=cfgoptions->defuintval;
+     status=1;
+     printf_params("[CONFIG] %s.%s set to default value %llu\n", ((prefix == NULL) ? "" : prefix), cfgoptions->optname, (long long unsigned)(*(cfgoptions->u64ptr)));
   }
-
   return status;
 }
 
-int config_setdefault_intlist(paramdef_t *cfgoptions, char *prefix) {
-  int status = 0;
-
+int config_setdefault_intlist(paramdef_t *cfgoptions, char *prefix)
+{
+  int status = 0;	  
   if( cfgoptions->defintarrayval != NULL) {
-    config_check_valptr(cfgoptions,(char **)&(cfgoptions->iptr), sizeof(int32_t *));
+    config_check_valptr(cfgoptions,(char **)&(cfgoptions->iptr), sizeof(int32_t*));
     cfgoptions->iptr=cfgoptions->defintarrayval;
     status=1;
-
     for (int j=0; j<cfgoptions->numelt ; j++) {
-      printf_params("[CONFIG] %s[%i] set to default value %i\n",cfgoptions->optname ,j,(int)cfgoptions->iptr[j]);
+  	printf_params("[CONFIG] %s[%i] set to default value %i\n",cfgoptions->optname ,j,(int)cfgoptions->iptr[j]);
     }
   }
-
   return status;
 }
 
-int config_setdefault_double(paramdef_t *cfgoptions, char *prefix) {
+int config_setdefault_double(paramdef_t *cfgoptions, char *prefix)
+{
   int status = 0;
   config_check_valptr(cfgoptions, (char **)&(cfgoptions->dblptr),sizeof(double));
-
   if( ((cfgoptions->paramflags & PARAMFLAG_MANDATORY) == 0)) {
-    *(cfgoptions->u64ptr)=cfgoptions->defdblval;
-    status=1;
-    printf_params("[CONFIG] %s set to default value %lf\n",cfgoptions->optname , *(cfgoptions->dblptr));
+     *(cfgoptions->u64ptr)=cfgoptions->defdblval;
+     status=1;
+     printf_params("[CONFIG] %s set to default value %lf\n",cfgoptions->optname , *(cfgoptions->dblptr));
   }
-
   return status;
-}
+} 
 
-int config_assign_ipv4addr(paramdef_t *cfgoptions, char *ipv4addr) {
+int config_assign_ipv4addr(paramdef_t *cfgoptions, char *ipv4addr)
+{
   config_check_valptr(cfgoptions,(char **)&(cfgoptions->uptr), sizeof(int));
-  int rst=inet_pton(AF_INET, ipv4addr ,cfgoptions->uptr );
-
+  int rst=inet_pton(AF_INET, ipv4addr ,cfgoptions->uptr ); 
   if (rst == 1 && *(cfgoptions->uptr) > 0) {
-    printf_params("[CONFIG] %s: %s\n",cfgoptions->optname, ipv4addr);
-    return 1;
+     printf_params("[CONFIG] %s: %s\n",cfgoptions->optname, ipv4addr);
+     return 1;
   } else {
-    if ( strncmp(ipv4addr,ANY_IPV4ADDR_STRING,sizeof(ANY_IPV4ADDR_STRING)) == 0) {
-      printf_params("[CONFIG] %s:%s (INADDR_ANY) \n",cfgoptions->optname,ipv4addr);
-      *cfgoptions->uptr=INADDR_ANY;
-      return 1;
-    } else {
-      fprintf(stderr,"[CONFIG] %s not valid for %s \n", ipv4addr, cfgoptions->optname);
-      return -1;
-    }
+     if ( strncmp(ipv4addr,ANY_IPV4ADDR_STRING,sizeof(ANY_IPV4ADDR_STRING)) == 0) {
+  	printf_params("[CONFIG] %s:%s (INADDR_ANY) \n",cfgoptions->optname,ipv4addr);
+  	*cfgoptions->uptr=INADDR_ANY;
+        return 1;
+     } else {
+  	fprintf(stderr,"[CONFIG] %s not valid for %s \n", ipv4addr, cfgoptions->optname);
+     	return -1;
+     }
   }
-
   return 0;
 }
 
 
-int config_setdefault_ipv4addr(paramdef_t *cfgoptions,  char *prefix) {
+int config_setdefault_ipv4addr(paramdef_t *cfgoptions,  char *prefix)
+{
   int status = 0;
-
+ 
   if (cfgoptions->defstrval != NULL) {
-    status = config_assign_ipv4addr(cfgoptions, cfgoptions->defstrval);
+     status = config_assign_ipv4addr(cfgoptions, cfgoptions->defstrval);
   }
-
   return status;
-}
+}    

common/config/config_userapi.h

@@ -20,7 +20,7 @@
  */
 
 /*! \file common/config/config_userapi.h
- * \brief: configuration module, include file to be used by the source code calling the
+ * \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
@@ -31,7 +31,7 @@
  * \warning
  */
 #ifndef INCLUDE_CONFIG_USERAPI_H
-#define INCLUDE_CONFIG_USERAPI_H
+#define INCLUDE_CONFIG_USERAPI_H 
 #include "config_load_configmodule.h"
 
 #ifdef __cplusplus
@@ -48,22 +48,17 @@ extern "C"
 #define CONFIG_ISPARAMFLAGSET(P,F) ( !!(P.paramflags & F))
 /* utility functions, to be used by configuration module and/or configuration libraries */
 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, char *prefix);
+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 void config_assign_processedint(paramdef_t *cfgoption, int val);
 extern void config_assign_int(paramdef_t *cfgoptions, char *fullname, int val);
 extern int config_assign_ipv4addr(paramdef_t *cfgoptions, char *ipv4addr);
 
-/* apis to get/check parameters, to be used by oai modules, at configuration time */
-#define CONFIG_CHECKALLSECTIONS "ALLSECTIONS"
-extern int config_check_unknown_cmdlineopt(char *prefix);
+/* apis to get parameters, to be used by oai modules, at configuration time */
 extern int config_get(paramdef_t *params,int numparams, char *prefix);
 extern int config_getlist(paramlist_def_t *ParamList, paramdef_t *params, int numparams, char *prefix);
 
-/* apis to set some of the paramdef_t fields before using the get/getlist api's */
-extern void config_set_checkfunctions(paramdef_t *params, checkedparam_t *checkfunctions, int numparams);
-
 /* apis to retrieve parameters info after calling get or getlist functions */
 extern int config_isparamset(paramdef_t *params,int paramidx);
 extern int config_get_processedint(paramdef_t *cfgoption);

common/config/libconfig/config_libconfig.c

@@ -42,60 +42,60 @@
 #include "errno.h"
 
 #if ( LIBCONFIG_VER_MAJOR == 1 && LIBCONFIG_VER_MINOR < 5)
-  #define config_setting_lookup config_lookup_from
+#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;
-  int numelt;
-  numelt=config_setting_length(setting);
-  config_check_valptr(cfgoptions,(char **)&(cfgoptions->strlistptr), sizeof(char *) * numelt);
-  st=0;
+int read_strlist(paramdef_t *cfgoptions,config_setting_t *setting, char *cfgpath)
+{
+const char *str;
+int st;
+int numelt;
 
-  for (int i=0; i< numelt ; 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 {
-      config_check_valptr(cfgoptions,&(cfgoptions->strlistptr[i]),strlen(str)+1);
-      sprintf(cfgoptions->strlistptr[i],"%s",str);
-      st++;
-      printf_params("[LIBCONFIG] %s%i: %s\n", cfgpath,i,cfgoptions->strlistptr[i]);
-    }
-  }
-
-  cfgoptions->numelt=numelt;
-  return st;
+   numelt=config_setting_length(setting);
+   config_check_valptr(cfgoptions,(char **)&(cfgoptions->strlistptr), sizeof(char *) * numelt);
+   st=0;
+   for (int i=0; i< numelt ; 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 {
+            config_check_valptr(cfgoptions,&(cfgoptions->strlistptr[i]),strlen(str)+1);
+            sprintf(cfgoptions->strlistptr[i],"%s",str);
+	    st++;
+            printf_params("[LIBCONFIG] %s%i: %s\n", cfgpath,i,cfgoptions->strlistptr[i]);
+       }
+   }
+   cfgoptions->numelt=numelt;
+   return st;
 }
 
-int read_intarray(paramdef_t *cfgoptions,config_setting_t *setting, char *cfgpath) {
-  cfgoptions->numelt=config_setting_length(setting);
+int read_intarray(paramdef_t *cfgoptions,config_setting_t *setting, char *cfgpath)
+{
 
-  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;
+   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 ) {
+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;
+  double dbl; 
   int rst;
   int status=0;
   int notfound;
@@ -104,244 +104,211 @@ int config_libconfig_get(paramdef_t *cfgoptions,int numoptions, char *prefix ) {
   int numdefvals=0;
   char cfgpath[512];  /* 512 should be enough for the sprintf below */
 
-  for(i=0; i<numoptions; i++) {
-    if (prefix != NULL) {
-      sprintf(cfgpath,"%s.%s",prefix,cfgoptions[i].optname);
-    } else {
-      sprintf(cfgpath,"%s",cfgoptions[i].optname);
-    }
+  for(i=0;i<numoptions;i++) {
 
-    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 {
-          defval=config_setdefault_string(&(cfgoptions[i]),prefix);
-        }
+     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 {
+              defval=config_setdefault_string(&(cfgoptions[i]),prefix); 
+	   }
+       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 {
+              defval=config_setdefault_stringlist(&(cfgoptions[i]),prefix);
+	   }
+       break;
+       	case TYPE_UINT8:
+       	case TYPE_INT8:	
+       	case TYPE_UINT16:
+       	case TYPE_INT16:
+       	case TYPE_UINT32:
+       	case TYPE_INT32:
+       	case TYPE_MASK:	
+           if ( config_lookup_int(&(libconfig_privdata.cfg),cfgpath, &u)) {
+              config_check_valptr(&(cfgoptions[i]), (char **)(&(cfgoptions[i].iptr)),sizeof(int32_t));
+	      config_assign_int(&(cfgoptions[i]),cfgpath,u);
+           } else {
+              defval=config_setdefault_int(&(cfgoptions[i]),prefix);
+	   }	      
         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 {
-          defval=config_setdefault_stringlist(&(cfgoptions[i]),prefix);
-        }
-
+       	case TYPE_UINT64:
+       	case TYPE_INT64:
+           if ( config_lookup_int64(&(libconfig_privdata.cfg),cfgpath, &llu)) {
+              config_check_valptr(&(cfgoptions[i]), (char **)&(cfgoptions[i].i64ptr),sizeof(long long));
+              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 {
+              defval=config_setdefault_int64(&(cfgoptions[i]),prefix);
+	   }	      
+        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 {
+              defval=config_setdefault_intlist(&(cfgoptions[i]),prefix);
+	   }    
         break;
-
-      case TYPE_UINT8:
-      case TYPE_INT8:
-      case TYPE_UINT16:
-      case TYPE_INT16:
-      case TYPE_UINT32:
-      case TYPE_INT32:
-      case TYPE_MASK:
-        if ( config_lookup_int(&(libconfig_privdata.cfg),cfgpath, &u)) {
-          config_check_valptr(&(cfgoptions[i]), (char **)(&(cfgoptions[i].iptr)),sizeof(int32_t));
-          config_assign_int(&(cfgoptions[i]),cfgpath,u);
-        } else {
-          defval=config_setdefault_int(&(cfgoptions[i]),prefix);
-        }
-
+       	case TYPE_DOUBLE:
+           if ( config_lookup_float(&(libconfig_privdata.cfg),cfgpath, &dbl)) {
+                 config_check_valptr(&(cfgoptions[i]), (char **)&(cfgoptions[i].dblptr),sizeof(double));
+                 *(cfgoptions[i].dblptr) = dbl;
+                 printf_params("[LIBCONFIG] %s: %lf\n", cfgpath,*(cfgoptions[i].dblptr) );
+           } else {
+              defval=config_setdefault_double(&(cfgoptions[i]),prefix);
+	   }	      
+        break;  
+       	case TYPE_IPV4ADDR:
+           if ( !config_lookup_string(&(libconfig_privdata.cfg),cfgpath, (const char **)&str)) {
+              defval=config_setdefault_ipv4addr(&(cfgoptions[i]),prefix);
+	   } else {
+              rst=config_assign_ipv4addr(cfgoptions, str);
+	      if (rst < 0) {
+		 fprintf(stderr,"[LIBCONFIG] %s not valid for %s \n", str, cfgpath);
+                 fatalerror=1;
+              }
+           }  
         break;
-
-      case TYPE_UINT64:
-      case TYPE_INT64:
-        if ( config_lookup_int64(&(libconfig_privdata.cfg),cfgpath, &llu)) {
-          config_check_valptr(&(cfgoptions[i]), (char **)&(cfgoptions[i].i64ptr),sizeof(long long));
-
-          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: %llu\n", cfgpath,(long long unsigned)(*(cfgoptions[i].i64ptr)) );
-          }
-        } else {
-          defval=config_setdefault_int64(&(cfgoptions[i]),prefix);
-        }
-
-        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 {
-          defval=config_setdefault_intlist(&(cfgoptions[i]),prefix);
-        }
-
-        break;
-
-      case TYPE_DOUBLE:
-        if ( config_lookup_float(&(libconfig_privdata.cfg),cfgpath, &dbl)) {
-          config_check_valptr(&(cfgoptions[i]), (char **)&(cfgoptions[i].dblptr),sizeof(double));
-          *(cfgoptions[i].dblptr) = dbl;
-          printf_params("[LIBCONFIG] %s: %lf\n", cfgpath,*(cfgoptions[i].dblptr) );
-        } else {
-          defval=config_setdefault_double(&(cfgoptions[i]),prefix);
-        }
-
-        break;
-
-      case TYPE_IPV4ADDR:
-        if ( !config_lookup_string(&(libconfig_privdata.cfg),cfgpath, (const char **)&str)) {
-          defval=config_setdefault_ipv4addr(&(cfgoptions[i]),prefix);
-        } else {
-          rst=config_assign_ipv4addr(cfgoptions, str);
-
-          if (rst < 0) {
-            fprintf(stderr,"[LIBCONFIG] %s not valid for %s \n", str, cfgpath);
+       	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;
-
-      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 */
-
+       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");
-      }
+        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;
+          numdefvals++;
+	  cfgoptions[i].paramflags = cfgoptions[i].paramflags |  PARAMFLAG_PARAMSETDEF;
       } else {
-        cfgoptions[i].paramflags = cfgoptions[i].paramflags |  PARAMFLAG_PARAMSET;
+          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),
+         ((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();
+      fprintf(stderr,"[LIBCONFIG] fatal errors found when processing  %s \n", libconfig_privdata.configfile );
+      config_libconfig_end();
+      end_configmodule();
   }
-
   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] */
+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++;
+    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 {
-      fprintf (stderr,"[LIBCONFIG] %s %d malloc error\n",__FILE__, __LINE__);
-      exit(-1);
+        printf("[LIBCONFIG] list %s not found in config file %s \n", 
+               listpath,libconfig_privdata.configfile );
+        ParamList->numelt= 0;
+        status = -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;
+    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) {
+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;
@@ -350,22 +317,24 @@ int config_libconfig_init(char *cfgP[], int numP) {
   /* 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)));
+                   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 ) {
+void config_libconfig_end(void )
+{
   config_destroy(&(libconfig_privdata.cfg));
-
   if ( libconfig_privdata.configfile != NULL ) {
-    free(libconfig_privdata.configfile);
-    libconfig_privdata.configfile=NULL;
-  }
+     free(libconfig_privdata.configfile);
+     libconfig_privdata.configfile=NULL;
+  } 
+  
 }

common/utils/DOC/loader/devusage.md

@@ -1,6 +1,7 @@
-The loader objectives are 
-1. provides a common mechanism to prevent an executable to include code that is only used under specific configurations, without rebuilding the code
-1. Provide a common mechanism to allow to choose between different implementations of a given set of functions, without rebuilding the code
+The configuration module objectives are 
+1. Allow easy parameters management in oai, helping the development of a flexible, modularized and fully configurable softmodem.
+1. Use a common configuration API in all oai modules
+1. Allow development of alternative configuration sources without modifying the oai code. Today the only delivered configuration source is the libconfig format configuration file.  
 
 As a developer you may need to look at these sections:
 

common/utils/LOG/DOC/addconsoletrace.md

@@ -1,110 +0,0 @@
-### Adding console traces in oai code
-#### console messages macros
-```C
-LOG_E(<component>,<format>,<argument>,...)
-LOG_W(<component>,<format>,<argument>,...)
-LOG_I(<component>,<format>,<argument>,...)
-LOG_D(<component>,<format>,<argument>,...)
-LOG_T(<component>,<format>,<argument>,...)
-)
-```
-these macros are used in place of the printf C function. The additionnal ***component*** parameter identifies the functionnal module which generates the message. At run time, the message will only be printed if the configured log level for the component is greater or equal than the macro level used in the code.
-
-| macro | level letter | level value | level name |
-|:---------|:---------------|:---------------|----------------:|
-| LOG_E |  E | 0 | error | 
-| LOG_W | W | 1 | warning |
-| LOG_I | I | 2 | informational |
-| LOG_D | D | 3 | debug |
-| LOG_T | T | 4 | trace |  
-
-component list is defined as an `enum` in  [log.h](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/common/utils/LOG/log.h). A new component can be defined by adding an item in this type, it must also be defined in the T tracer [T_messages.txt ](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/common/utils/T/T_messages.txt).
-
-Most oai sources are including LOG macros.
-
-#### conditional code macros
-
-```C
-LOG_DEBUGFLAG(<flag>)
-```
-this macro is to be used in if statements. The condition is true if the flag has been set, as described in the [run time usage page](rtusage.md) 
-```C
-if ( LOG_DEBUGFLAG(<flag>) {
-/* 
-   the code below is only executed if the corresponding
-   <flag>_debug option is set.
- */ 
-......................
-......................
-}
-```
-[example in oai code](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c#L396) 
-
-#### memory dump macros
-```C
-LOG_DUMPFLAG(<flag>)
-```
-this macro is to be used in if statements. The condition is true if the flag has been set, as described in the [run time usage page](rtusage.md). It is mainly provided to surround LOG_M macros or direct calls to `log_dump`which otherwise would be unconditionals.
-```C
-if ( LOG_DUMPFLAG(<flag>) {
-/* 
-   the code below is only executed if the corresponding
-   <flag>_dump option is set.
- */ 
-LOG_M(.............
-LOG_M(.............
-log_dump(...
-}
-
-[example in oai code](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair1/PHY/LTE_TRANSPORT/prach.c#L205) 
-#### matlab format dump
-```C
-LOG_M(file, vector, data, len, dec, format)
-```
-|argument| type| description |
-|:-----------|:-------|-----------------:|
-| file       | char* |path to the fle which will contain the dump |
-|vector  |char * |name of the dump, printed at the top of the dump file |
-|data| void *| pointer to the memory to be dumpped |
-|len |  int | length of the data to be dumpped, in `dec` unit|
-| dec| int | length of each data item.Interpretation depends on format|
-|format| int | defines the type of data to be dumped|
-
-This macro can be used to dump a buffer in a format that can be used for analyze via tools like matlab or octave. **It must be surrounded by LOG_DEBUGFLAG or LOG_DUMPFLAG macros, to prevent the dump to be built unconditionally.** The LOG_M macro points to the `write_file_matlab` function implemented in  [log.c](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/common/utils/LOG/log.c). **This function should be revisited for more understandable implementation and ease of use (format parameter ???)**
-[example in oai code](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair1/PHY/LTE_TRANSPORT/prach.c#L205) 
-
-#### hexadecimal format dump
-```C
-LOG_DUMPMSG(c, f, b, s, x...)
-```
-dumps a memory region if the corresponding debug flag `f` is set as explained here [run time usage page](rtusage.md) 
-
-|argument| type| description |
-|:-----------|:-------|-----------------:|
-| c       | int, component id (in `comp_name_t` enum)| used to print the message, as specified by the s and x arguments |
-|f  |int  |flag used to filter the dump depending on the logs configuration. flag list is defined by the LOG_MASKMAP_INIT macro in  [log.h](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/common/utils/LOG/log.h) |
-|b| void *| pointer to the memory to be dumpped |
-|s |  int | length of the data to be dumpped in char|
-| x...| printf format and arguments| text string to be printed at the top of the dump|
-
-This macro can be used to conditionaly dump a buffer, bytes by bytes, giving the integer value of each byte in hexadecimal form.
-[example in oai code](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair2/RRC/LTE/rrc_eNB.c#L1181) 
-
-This macro points to the `log_dump` function, implemented in  [log.c](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/common/utils/LOG/log.c). This function can also dump buffers containing `double` data via the LOG_UDUMPMSG macro
-
-```C
-LOG_UDUMPMSG(c, b, s, f, x...) 
-```
-|argument| type| description |
-|:-----------|:-------|-----------------:|
-| c       | int, component id (in `comp_name_t` enum)| used to print the message, as specified by the s and x arguments |
-|b| void *| pointer to the memory to be dumpped |
-|s |  int | length of the data to be dumpped in char|
-|f|  int | format of dumped data LOG_DUMP_CHAR or  LOG_DUMP_DOUBLE|
-| x...| printf format and arguments| text string to be printed at the top of the dump|
-
-[example in oai code](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair1/SIMULATION/LTE_PHY/dlsim.c#L1974) 
-
-[logging facility developer main page](devusage.md)  
-[logging facility  main page](log.md)  
-[oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)

common/utils/LOG/DOC/arch.md

@@ -1,12 +0,0 @@
-# logging facility source files
-
-The oai logging facility is implemented in two source files, located in [common/utils/LOG](LOG)
-1. [log.c](../log.c) contains logging implementation
-1.  [log.h](../log.h) is the logging facility include file containing both private and public data type definitions. It also contain API prototypes.  
-
-The logging facility doesn't create any thread, all api's are executed in the context of the caller. The tracing macro's `LOG_<X>` are all using the logRecord_mt function to output the messages. To keep this function thread safe it must perform a single system call to the output stream. The buffer used to build the message must be specific to the calling thread, which is today enforced by using a variable in the logRecord_mt stack.
-
-Data used by the logging utility are defined by the `log_t` structure which is allocated at init time, when calling the `logInit` function.
-
-[logging facility  main page](log.md)  
-[oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)

common/utils/LOG/DOC/configurelog.md

@@ -1,49 +0,0 @@
-### Initializing and configuring the logging facility
-
-#### logging facility APIs
-```C
-int  logInit (void);
-```
-Allocate the internal data used by the logging utility, set the configuration, using the [configuration  module](../../../config/DOC/config.md) 
-
-```C
-void logClean (void)
-```
-Reset console attributes (color settings) and possibly close opened log files. Logging facility is still usable after this call, the internal data are not freed.
-
-```C
-int  set_log(int component, int level)
-void set_glog(int level)
-```
-Set a component or  all components logiing level. Messages which level is lower than this level are not printed to the console.
-
-```C
-void set_glog_onlinelog(int enable)
-```
-Enable or disable all logging messages. Even error level messages are discarded, which is not advised. This can be usefull to temporarily workaround high rate of logging messages.
-
-```C
-void set_component_filelog(int comp)
-void close_component_filelog(int comp)
-```
-
-Redirect or reset to stdout the output stream used by the logging facility. When the output stream is redirected to a file, it is created under /tmp with a hard-coded filename including the componemt name.
-
-```C
-SET_LOG_DEBUG(flag) 
-CLEAR_LOG_DEBUG(flag)
-SET_LOG_DUMP(flag) 
-CLEAR_LOG_DUMP(flag)
-```
- These macros are used to set or clear the corresponding bit flag, trigerring the activation or un-activation of conditional code or memory dumps generation.
-
-Example of using the logging utility APIs can be found, for initialization and cleanup,  in [lte-softmodem.c](../../../../targets/RT/USER/lte-softmodem.c) and in the [telnet server log command implementation](../../telnetsrv/telnetsrv_proccmd.c) for a complete access to the logging facility features.
-
-#### components and debug flags definitions
-
-Adding a new component is just adding an item in the `comp_name_t` enum defined in [log.h](../log.h) . You must also declare it in the T Tracer facility [message fefinitions](../../T/T_messages.txt).
-To add a flag than can then be used for adding conditional code or memory dumps you have to add the flag definition in the `LOG_MASKMAP_INIT` macro, in [log.h](../log.h). 
-
-[logging facility developer main page](devusage.md)  
-[logging facility  main page](log.md)  
-[oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)

common/utils/LOG/DOC/devusage.md

@@ -1,14 +0,0 @@
-### logging facility developer usage
-The logging facility objectives are 
-1. provide a common console tracing mechanism 
-1. Allow a flexible activation of console traces, by configuration or dynamically at any time while code is running.
-
-Most developpers will only use the log macros to add console messages to the code. The logging facility also provides an api that is used for initialization and configuration. 
-
-[Adding console traces in oaicode](addconsoletrace.md) 
-
-[Configuring the logging facility](configurelog.md) 
-
-
-[logging facility  main page](log.md)  
-[oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)

common/utils/LOG/DOC/log.md

@@ -1,19 +0,0 @@
-# OAI console logging facility
-
-oai includes a console logging facility that any component should use when writting informational or debugging messages to the softmodem or uesoftmodem stdout stream. 
-By default, this facility is included at build-time and activated at run-time. The T Tracer and the Logging facility share common options for activation:
-
--   To disable the logging facility (and T Tracer) at build-time use the *--disable-T-Tracer* switch:
-
-```bash
-/build_oai --disable-T-Tracer
-```
--  To use the the T-Tracer instead of the console logging facility, use the command line option *T_stdout*.  *T_stdout* is a boolean option, which, when set to 0 (false) disable the console logging facility. All stdout messages are then sent to the T-Tracer.
-
-## Documentation
-
-* [runtime usage](rtusage.md)
-* [developer usage](devusage.md)
-* [module architecture](arch.md)
-
-[oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)

common/utils/LOG/DOC/rtusage.md

@@ -1,265 +0,0 @@
-## configuring the logging facility
-The logging facility is fully configurable and it uses the [config module](../../../config/config.md) to get its parameters at init time. The [telnet server](../../telnetsrv/DOC/telnetsrv.md) includes a set of commands which can be used to dynamically modify the logging facility behavior 
-
-All logging facility parameters are defined in the log_config section. Some parameters are global to the logging facility, they modify the way messages are printed to stdout. Conversely, some parameters are specific to a component and  only modify the behavior for messages issued by a given component. A third type of parameters can be used to activate conditional debug code or dump messages or buffers.
-
-### global parameters
-
-| name | type | default | description |
-|:---:|:---:|:---:|:----|
-| `global_log_level` | `pre-defined string of char` | `info` |  Allows printing of messages up to the specified  level. Available levels, from lower to higher are `error`,`warn`,`info`,`debug`,`trace` |
-| `global_log_online` | `boolean` | 1 (=true) | If false, all console messages are discarded, whatever their level |
-| `global_log_options` | `list of pre-defined string of char` |  |  3 options can be specified to trigger the information added in the header of the message:  `nocolor`, disable color usage in log messages, usefull when redirecting logs to a file, where escape sequences used for color selection can be annoying, `level`, add a one letter level id in the message header (T,D,I,W,E for trace, debug, info, warning, error),`thread`, add the thread name in the message header|
-
-### Component specific parameters
-| name | type | default | description |
-|:---:|:---:|:---:|:----|
-| `<component>_log_level` | `boolean` | global log level, as defined by the  `global_log_level ` parameter) | 
-| `<component>_log_infile` | `boolean` | 0 = false| Triggers the redirection of log messages printed by the specified component in a file. The file path and name is /tmp/<componemt>.[extension] the extension is optional and component dependant, it can be `log `,  `dat `,  `txt `|
-
-The list of components defined within oai can be retrieved from the  [config module](../../../config/config.md) traces, when asking for config module debugging info on the command line:
-
-```bash
-./lte-softmodem -O libconfig:<path to config file>:dbgl5
-
-[LIBCONFIG] log_config.global_log_level: "info"
-[CONFIG] global_log_online: 1
-[CONFIG] log_config.global_log_online set to default value
-[LIBCONFIG] log_config: 3/3 parameters successfully set, (1 to default value)
-[LIBCONFIG] global_log_options[0]: nocolor
-[LIBCONFIG] global_log_options[1]: level
-[LIBCONFIG] global_log_options[2]: thread
-[CONFIG] log_config 1 options set from command line
-[LIBCONFIG] log_config.phy_log_level: "info"
-[LIBCONFIG] log_config.mac_log_level: "info"
-[CONFIG] log_config.sim_log_level set to default value "info"
-[CONFIG] log_config.ocg_log_level set to default value "info"
-[CONFIG] log_config.omg_log_level set to default value "info"
-[CONFIG] log_config.opt_log_level set to default value "info"
-[CONFIG] log_config.otg_log_level set to default value "info"
-[CONFIG] log_config.otg_latency_log_level set to default value "info"
-[CONFIG] log_config.otg_latency_bg_log_level set to default value "info"
-[CONFIG] log_config.otg_gp_log_level set to default value "info"
-[CONFIG] log_config.otg_gp_bg_log_level set to default value "info"
-[CONFIG] log_config.otg_jitter_log_level set to default value "info"
-[LIBCONFIG] log_config.rlc_log_level: "info"
-[LIBCONFIG] log_config.pdcp_log_level: "info"
-[LIBCONFIG] log_config.rrc_log_level: "info"
-[CONFIG] log_config.nas_log_level set to default value "info"
-[CONFIG] log_config.perf_log_level set to default value "info"
-[CONFIG] log_config.oip_log_level set to default value "info"
-[CONFIG] log_config.cli_log_level set to default value "info"
-[CONFIG] log_config.msc_log_level set to default value "info"
-[CONFIG] log_config.ocm_log_level set to default value "info"
-[CONFIG] log_config.udp_log_level set to default value "info"
-[CONFIG] log_config.gtpv1u_log_level set to default value "info"
-[CONFIG] log_config.comp23?_log_level set to default value "info"
-[CONFIG] log_config.s1ap_log_level set to default value "info"
-[CONFIG] log_config.sctp_log_level set to default value "info"
-[LIBCONFIG] log_config.hw_log_level: "info"
-[CONFIG] log_config.osa_log_level set to default value "info"
-[CONFIG] log_config.eral_log_level set to default value "info"
-[CONFIG] log_config.mral_log_level set to default value "info"
-[CONFIG] log_config.enb_app_log_level set to default value "info"
-[CONFIG] log_config.flexran_agent_log_level set to default value "info"
-[CONFIG] log_config.tmr_log_level set to default value "info"
-[CONFIG] log_config.usim_log_level set to default value "info"
-[CONFIG] log_config.localize_log_level set to default value "info"
-[CONFIG] log_config.x2ap_log_level set to default value "info"
-[CONFIG] log_config.loader_log_level set to default value "info"
-[CONFIG] log_config.asn_log_level set to default value "info"
-[LIBCONFIG] log_config: 38/38 parameters successfully set, (32 to default value)
-[CONFIG] log_config 0 options set from command line
-[CONFIG] phy_log_infile: 0
-[CONFIG] log_config.phy_log_infile set to default value
-[CONFIG] mac_log_infile: 0
-[CONFIG] log_config.mac_log_infile set to default value
-[CONFIG] sim_log_infile: 0
-[CONFIG] log_config.sim_log_infile set to default value
-[CONFIG] ocg_log_infile: 0
-[CONFIG] log_config.ocg_log_infile set to default value
-[CONFIG] omg_log_infile: 0
-[CONFIG] log_config.omg_log_infile set to default value
-[CONFIG] opt_log_infile: 0
-[CONFIG] log_config.opt_log_infile set to default value
-[CONFIG] otg_log_infile: 0
-[CONFIG] log_config.otg_log_infile set to default value
-[CONFIG] otg_latency_log_infile: 0
-[CONFIG] log_config.otg_latency_log_infile set to default value
-[CONFIG] otg_latency_bg_log_infile: 0
-[CONFIG] log_config.otg_latency_bg_log_infile set to default value
-[CONFIG] otg_gp_log_infile: 0
-[CONFIG] log_config.otg_gp_log_infile set to default value
-[CONFIG] otg_gp_bg_log_infile: 0
-[CONFIG] log_config.otg_gp_bg_log_infile set to default value
-[CONFIG] otg_jitter_log_infile: 0
-[CONFIG] log_config.otg_jitter_log_infile set to default value
-[CONFIG] rlc_log_infile: 0
-[CONFIG] log_config.rlc_log_infile set to default value
-[CONFIG] pdcp_log_infile: 0
-[CONFIG] log_config.pdcp_log_infile set to default value
-[CONFIG] rrc_log_infile: 0
-[CONFIG] log_config.rrc_log_infile set to default value
-[CONFIG] nas_log_infile: 0
-[CONFIG] log_config.nas_log_infile set to default value
-[CONFIG] perf_log_infile: 0
-[CONFIG] log_config.perf_log_infile set to default value
-[CONFIG] oip_log_infile: 0
-[CONFIG] log_config.oip_log_infile set to default value
-[CONFIG] cli_log_infile: 0
-[CONFIG] log_config.cli_log_infile set to default value
-[CONFIG] msc_log_infile: 0
-[CONFIG] log_config.msc_log_infile set to default value
-[CONFIG] ocm_log_infile: 0
-[CONFIG] log_config.ocm_log_infile set to default value
-[CONFIG] udp_log_infile: 0
-[CONFIG] log_config.udp_log_infile set to default value
-[CONFIG] gtpv1u_log_infile: 0
-[CONFIG] log_config.gtpv1u_log_infile set to default value
-[CONFIG] comp23?_log_infile: 0
-[CONFIG] log_config.comp23?_log_infile set to default value
-[CONFIG] s1ap_log_infile: 0
-[CONFIG] log_config.s1ap_log_infile set to default value
-[CONFIG] sctp_log_infile: 0
-[CONFIG] log_config.sctp_log_infile set to default value
-[CONFIG] hw_log_infile: 0
-[CONFIG] log_config.hw_log_infile set to default value
-[CONFIG] osa_log_infile: 0
-[CONFIG] log_config.osa_log_infile set to default value
-[CONFIG] eral_log_infile: 0
-[CONFIG] log_config.eral_log_infile set to default value
-[CONFIG] mral_log_infile: 0
-[CONFIG] log_config.mral_log_infile set to default value
-[CONFIG] enb_app_log_infile: 0
-[CONFIG] log_config.enb_app_log_infile set to default value
-[CONFIG] flexran_agent_log_infile: 0
-[CONFIG] log_config.flexran_agent_log_infile set to default value
-[CONFIG] tmr_log_infile: 0
-[CONFIG] log_config.tmr_log_infile set to default value
-[CONFIG] usim_log_infile: 0
-[CONFIG] log_config.usim_log_infile set to default value
-[CONFIG] localize_log_infile: 0
-[CONFIG] log_config.localize_log_infile set to default value
-[CONFIG] x2ap_log_infile: 0
-[CONFIG] log_config.x2ap_log_infile set to default value
-[CONFIG] loader_log_infile: 0
-[CONFIG] log_config.loader_log_infile set to default value
-[CONFIG] asn_log_infile: 0
-[CONFIG] log_config.asn_log_infile set to default value
-[LIBCONFIG] log_config: 38/38 parameters successfully set, (38 to default value)
-[CONFIG] log_config 0 options set from command line
-[CONFIG] PRACH_debug: 0
-[CONFIG] log_config.PRACH_debug set to default value
-[CONFIG] RU_debug: 0
-[CONFIG] log_config.RU_debug set to default value
-[CONFIG] UE_PHYPROC_debug: 0
-[CONFIG] log_config.UE_PHYPROC_debug set to default value
-[CONFIG] LTEESTIM_debug: 0
-[CONFIG] log_config.LTEESTIM_debug set to default value
-[CONFIG] DLCELLSPEC_debug: 0
-[CONFIG] log_config.DLCELLSPEC_debug set to default value
-[CONFIG] ULSCH_debug: 0
-[CONFIG] log_config.ULSCH_debug set to default value
-[CONFIG] RRC_debug: 0
-[CONFIG] log_config.RRC_debug set to default value
-[CONFIG] PDCP_debug: 0
-[CONFIG] log_config.PDCP_debug set to default value
-[CONFIG] DFT_debug: 0
-[CONFIG] log_config.DFT_debug set to default value
-[CONFIG] ASN1_debug: 0
-[CONFIG] log_config.ASN1_debug set to default value
-[CONFIG] CTRLSOCKET_debug: 0
-[CONFIG] log_config.CTRLSOCKET_debug set to default value
-[CONFIG] SECURITY_debug: 0
-[CONFIG] log_config.SECURITY_debug set to default value
-[CONFIG] NAS_debug: 0
-[CONFIG] log_config.NAS_debug set to default value
-[CONFIG] RLC_debug: 0
-[CONFIG] log_config.RLC_debug set to default value
-[CONFIG] UE_TIMING_debug: 0
-[CONFIG] log_config.UE_TIMING_debug set to default value
-[LIBCONFIG] log_config: 15/15 parameters successfully set, (15 to default value)
-[CONFIG] log_config 0 options set from command line
-[CONFIG] PRACH_dump: 0
-[CONFIG] log_config.PRACH_dump set to default value
-[CONFIG] RU_dump: 0
-[CONFIG] log_config.RU_dump set to default value
-[CONFIG] UE_PHYPROC_dump: 0
-[CONFIG] log_config.UE_PHYPROC_dump set to default value
-[CONFIG] LTEESTIM_dump: 0
-[CONFIG] log_config.LTEESTIM_dump set to default value
-[CONFIG] DLCELLSPEC_dump: 0
-[CONFIG] log_config.DLCELLSPEC_dump set to default value
-[CONFIG] ULSCH_dump: 0
-[CONFIG] log_config.ULSCH_dump set to default value
-[CONFIG] RRC_dump: 0
-[CONFIG] log_config.RRC_dump set to default value
-[CONFIG] PDCP_dump: 0
-[CONFIG] log_config.PDCP_dump set to default value
-[CONFIG] DFT_dump: 0
-[CONFIG] log_config.DFT_dump set to default value
-[CONFIG] ASN1_dump: 0
-[CONFIG] log_config.ASN1_dump set to default value
-[CONFIG] CTRLSOCKET_dump: 0
-[CONFIG] log_config.CTRLSOCKET_dump set to default value
-[CONFIG] SECURITY_dump: 0
-[CONFIG] log_config.SECURITY_dump set to default value
-[CONFIG] NAS_dump: 0
-[CONFIG] log_config.NAS_dump set to default value
-[CONFIG] RLC_dump: 0
-[CONFIG] log_config.RLC_dump set to default value
-[CONFIG] UE_TIMING_dump: 0
-[CONFIG] log_config.UE_TIMING_dump set to default value
-[LIBCONFIG] log_config: 15/15 parameters successfully set, (15 to default value)
-[CONFIG] log_config 0 options set from command line
-log init done
-
-```
-It can also be retrieved when using the telnet server, as explained  [below](### Using the telnet server to configure the logging facility) 
-
-### parameters to activate conditional code
-| name | type | default | description |
-|:---:|:---:|:---:|:----|
-| `<flag>_debug` | `boolean` | 0 = false | Triggers the activation of conditional code identified by the specified flag.
-| `<flag>_dump` | `boolean` | 0 = false| Triggers buffer dump, on the console in text form or in a file in matlab format, depending on the developper choice and forcasted usage|
-
-### Using the configuration file to configure the logging facility
-The following example sets all components log level to info, exept for hw,phy,mac,rlc,pdcp,rrc which log levels are set to error or warning.
-```bash
-    log_config :
-    {
-      global_log_level                      ="info";
-      hw_log_level                          ="error";
-      phy_log_level                         ="error";
-      mac_log_level                         ="warn";
-      rlc_log_level                         ="error"
-      pdcp_log_level                        ="error";
-      rrc_log_level                         ="error";
-   };
-```
-### Using the command line to configure the logging facility
-Command line parameter values supersedes values specified in the configuration file. 
-```bash
-./lte-softmodem -O --log_config.global_log_options nocolor,level,thread  --log_config.prach_log_level debug --log_config.PRACH_debug 
-```
-In this example to get all the debug PRACH messages it is necessary to also set the PRACH_debug flag. This is a choice from the developper.
-The log messages will be printed whithout color and the header will include the lmessage evel and the thread name:
-```bash
-[PHY]I ru thread Time in secs now: 104652566 
-[PHY]I ru thread Time in secs last pps: 91827117 
-[PHY]I ru thread RU 0 rf device ready
-[PHY]I ru thread RU 0 no asynch_south interface
-[MAC]E rxtx processing SCHED_MODE=0
-[PHY]I lte-softmodem PRACH (eNB) : running rx_prach for subframe 1, prach_FreqOffset 2, prach_ConfigIndex 0 , rootSequenceIndex 0
-[PHY]I lte-softmodem prach_I0 = 0.0 dB
-[PHY]I rxtx processing max_I0 21, min_I0 0
-[PHY]I lte-softmodem PRACH (eNB) : running rx_prach for subframe 1, prach_FreqOffset 2, prach_ConfigIndex 0 , rootSequenceIndex 0
-[PHY]I lte-softmodem PRACH (eNB) : running rx_prach for subframe 1, prach_FreqOffset 2, prach_ConfigIndex 0 , rootSequenceIndex 0
-```
- 
-### Using the telnet server to configure the logging facility
-The telnet server includes a `log` command which can be used to dymically modify the logging facility configuration parameters.
-[telnet server ***softmodem log*** commands](../../telnetsrv/DOC/telnetlog.md) 
-
-[logging facility  main page](log.md)  
-[oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)

common/utils/LOG/log.c

@@ -39,9 +39,13 @@
 #include "vcd_signal_dumper.h"
 #include "assertions.h"
 
-#include <pthread.h>
-#include <string.h>
-#include <linux/prctl.h>
+#if defined(ENABLE_ITTI)
+# include "intertask_interface.h"
+#endif
+
+# include <pthread.h>
+# include <string.h>
+#include  <linux/prctl.h>
 #include "common/config/config_userapi.h"
 // main log variables
 
@@ -71,21 +75,25 @@ char *log_level_highlight_start[] = {LOG_RED, LOG_ORANGE, "", LOG_BLUE, LOG_CYBL
 char *log_level_highlight_end[]   = {LOG_RESET,LOG_RESET,LOG_RESET, LOG_RESET,LOG_RESET};   /*!< \brief Optional end-format strings for highlighting */
 
 
-int write_file_matlab(const char *fname,const char *vname,void *data,int length,int dec,char format) {
+int write_file_matlab(const char *fname,const char *vname,void *data,int length,int dec,char format)
+{
+
   FILE *fp=NULL;
   int i;
 
   if (data == NULL)
-    return -1;
-
+     return -1;
   //printf("Writing %d elements of type %d to %s\n",length,format,fname);
 
+
   if (format == 10 || format ==11 || format == 12 || format == 13 || format == 14) {
     fp = fopen(fname,"a+");
   } else if (format != 10 && format !=11  && format != 12 && format != 13 && format != 14) {
     fp = fopen(fname,"w+");
   }
 
+
+
   if (fp== NULL) {
     printf("[OPENAIR][FILE OUTPUT] Cannot open file %s\n",fname);
     return(-1);
@@ -94,108 +102,121 @@ int write_file_matlab(const char *fname,const char *vname,void *data,int length,
   if (format != 10 && format !=11  && format != 12 && format != 13 && format != 14)
     fprintf(fp,"%s = [",vname);
 
+
   switch (format) {
-    case 0:   // real 16-bit
-      for (i=0; i<length; i+=dec) {
-        fprintf(fp,"%d\n",((short *)data)[i]);
-      }
+  case 0:   // real 16-bit
 
-      break;
+    for (i=0; i<length; i+=dec) {
+      fprintf(fp,"%d\n",((short *)data)[i]);
+    }
 
-    case 1:  // complex 16-bit
-    case 13:
-    case 14:
-    case 15:
-      for (i=0; i<length<<1; i+=(2*dec)) {
-        fprintf(fp,"%d + j*(%d)\n",((short *)data)[i],((short *)data)[i+1]);
-      }
+    break;
 
-      break;
+  case 1:  // complex 16-bit
+  case 13:
+  case 14:
+  case 15:
 
-    case 2:  // real 32-bit
-      for (i=0; i<length; i+=dec) {
-        fprintf(fp,"%d\n",((int *)data)[i]);
-      }
+    for (i=0; i<length<<1; i+=(2*dec)) {
+      fprintf(fp,"%d + j*(%d)\n",((short *)data)[i],((short *)data)[i+1]);
 
-      break;
+    }
 
-    case 3: // complex 32-bit
-      for (i=0; i<length<<1; i+=(2*dec)) {
-        fprintf(fp,"%d + j*(%d)\n",((int *)data)[i],((int *)data)[i+1]);
-      }
 
-      break;
+    break;
 
-    case 4: // real 8-bit
-      for (i=0; i<length; i+=dec) {
-        fprintf(fp,"%d\n",((char *)data)[i]);
-      }
+  case 2:  // real 32-bit
+    for (i=0; i<length; i+=dec) {
+      fprintf(fp,"%d\n",((int *)data)[i]);
+    }
 
-      break;
+    break;
 
-    case 5: // complex 8-bit
-      for (i=0; i<length<<1; i+=(2*dec)) {
-        fprintf(fp,"%d + j*(%d)\n",((char *)data)[i],((char *)data)[i+1]);
-      }
+  case 3: // complex 32-bit
+    for (i=0; i<length<<1; i+=(2*dec)) {
+      fprintf(fp,"%d + j*(%d)\n",((int *)data)[i],((int *)data)[i+1]);
+    }
 
-      break;
+    break;
 
-    case 6:  // real 64-bit
-      for (i=0; i<length; i+=dec) {
-        fprintf(fp,"%lld\n",((long long *)data)[i]);
-      }
+  case 4: // real 8-bit
+    for (i=0; i<length; i+=dec) {
+      fprintf(fp,"%d\n",((char *)data)[i]);
+    }
 
-      break;
+    break;
 
-    case 7: // real double
-      for (i=0; i<length; i+=dec) {
-        fprintf(fp,"%g\n",((double *)data)[i]);
-      }
+  case 5: // complex 8-bit
+    for (i=0; i<length<<1; i+=(2*dec)) {
+      fprintf(fp,"%d + j*(%d)\n",((char *)data)[i],((char *)data)[i+1]);
+    }
 
-      break;
+    break;
 
-    case 8: // complex double
-      for (i=0; i<length<<1; i+=2*dec) {
-        fprintf(fp,"%g + j*(%g)\n",((double *)data)[i], ((double *)data)[i+1]);
-      }
+  case 6:  // real 64-bit
+    for (i=0; i<length; i+=dec) {
+      fprintf(fp,"%lld\n",((long long*)data)[i]);
+    }
 
-      break;
+    break;
 
-    case 9: // real unsigned 8-bit
-      for (i=0; i<length; i+=dec) {
-        fprintf(fp,"%d\n",((unsigned char *)data)[i]);
-      }
+  case 7: // real double
+    for (i=0; i<length; i+=dec) {
+      fprintf(fp,"%g\n",((double *)data)[i]);
+    }
 
-      break;
+    break;
 
-    case 10 : // case eren 16 bit complex :
-      for (i=0; i<length<<1; i+=(2*dec)) {
-        if((i < 2*(length-1)) && (i > 0))
-          fprintf(fp,"%d + j*(%d),",((short *)data)[i],((short *)data)[i+1]);
-        else if (i == 2*(length-1))
-          fprintf(fp,"%d + j*(%d);",((short *)data)[i],((short *)data)[i+1]);
-        else if (i == 0)
-          fprintf(fp,"\n%d + j*(%d),",((short *)data)[i],((short *)data)[i+1]);
-      }
+  case 8: // complex double
+    for (i=0; i<length<<1; i+=2*dec) {
+      fprintf(fp,"%g + j*(%g)\n",((double *)data)[i], ((double *)data)[i+1]);
+    }
 
-      break;
+    break;
 
-    case 11 : //case eren 16 bit real for channel magnitudes:
-      for (i=0; i<length; i+=dec) {
-        if((i <(length-1))&& (i > 0))
-          fprintf(fp,"%d,",((short *)data)[i]);
-        else if (i == (length-1))
-          fprintf(fp,"%d;",((short *)data)[i]);
-        else if (i == 0)
-          fprintf(fp,"\n%d,",((short *)data)[i]);
-      }
+  case 9: // real unsigned 8-bit
+    for (i=0; i<length; i+=dec) {
+      fprintf(fp,"%d\n",((unsigned char *)data)[i]);
+    }
 
-      printf("\n eren: length :%d",length);
-      break;
+    break;
+
+
+  case 10 : // case eren 16 bit complex :
+
+    for (i=0; i<length<<1; i+=(2*dec)) {
+
+      if((i < 2*(length-1)) && (i > 0))
+        fprintf(fp,"%d + j*(%d),",((short *)data)[i],((short *)data)[i+1]);
+      else if (i == 2*(length-1))
+        fprintf(fp,"%d + j*(%d);",((short *)data)[i],((short *)data)[i+1]);
+      else if (i == 0)
+        fprintf(fp,"\n%d + j*(%d),",((short *)data)[i],((short *)data)[i+1]);
+
+
+
+    }
+
+    break;
+
+  case 11 : //case eren 16 bit real for channel magnitudes:
+    for (i=0; i<length; i+=dec) {
+
+      if((i <(length-1))&& (i > 0))
+        fprintf(fp,"%d,",((short *)data)[i]);
+      else if (i == (length-1))
+        fprintf(fp,"%d;",((short *)data)[i]);
+      else if (i == 0)
+        fprintf(fp,"\n%d,",((short *)data)[i]);
+    }
+
+    printf("\n eren: length :%d",length);
+    break;
+
+  case 12 : // case eren for log2_maxh real unsigned 8 bit
+    fprintf(fp,"%d \n",((unsigned char *)&data)[0]);
+    break;
 
-    case 12 : // case eren for log2_maxh real unsigned 8 bit
-      fprintf(fp,"%d \n",((unsigned char *)&data)[0]);
-      break;
   }
 
   if (format != 10 && format !=11 && format !=12 && format != 13 && format != 15) {
@@ -214,152 +235,131 @@ int write_file_matlab(const char *fname,const char *vname,void *data,int length,
 void  log_getconfig(log_t *g_log) {
   char *gloglevel = NULL;
   int consolelog ;
+  
+  
   paramdef_t logparams_defaults[] = LOG_GLOBALPARAMS_DESC;
   paramdef_t logparams_level[MAX_LOG_PREDEF_COMPONENTS];
   paramdef_t logparams_logfile[MAX_LOG_PREDEF_COMPONENTS];
   paramdef_t logparams_debug[sizeof(log_maskmap)/sizeof(mapping)];
   paramdef_t logparams_dump[sizeof(log_maskmap)/sizeof(mapping)];
+
   int ret = config_get( logparams_defaults,sizeof(logparams_defaults)/sizeof(paramdef_t),CONFIG_STRING_LOG_PREFIX);
-
   if (ret <0) {
-    fprintf(stderr,"[LOG] init aborted, configuration couldn't be performed");
-    return;
-  }
+       fprintf(stderr,"[LOG] init aborted, configuration couldn't be performed");
+       return;
+  } 
 
-  /* set LOG display options (enable/disable color, thread name, level ) */
+/* set LOG display options (enable/disable color, thread name, level ) */
   for(int i=0; i<logparams_defaults[LOG_OPTIONS_IDX].numelt ; i++) {
-    for(int j=0; log_options[j].name != NULL ; j++) {
-      if (strcmp(logparams_defaults[LOG_OPTIONS_IDX].strlistptr[i],log_options[j].name) == 0) {
-        g_log->flag = g_log->flag |  log_options[j].value;
-        break;
-      } else if (log_options[j+1].name == NULL) {
-        fprintf(stderr,"Unknown log option: %s\n",logparams_defaults[LOG_OPTIONS_IDX].strlistptr[i]);
-        exit(-1);
-      }
-    }
-  }
-
-  /* build the parameter array for setting per component log level and infile options */
+     for(int j=0; log_options[j].name != NULL ; j++) {
+        if (strcmp(logparams_defaults[LOG_OPTIONS_IDX].strlistptr[i],log_options[j].name) == 0) { 
+            g_log->flag = g_log->flag |  log_options[j].value;
+            break;
+        } else if (log_options[j+1].name == NULL){
+            fprintf(stderr,"Unknown log option: %s\n",logparams_defaults[LOG_OPTIONS_IDX].strlistptr[i]);
+            exit(-1);
+        }
+     } 
+  } 
+  
+/* build the parameter array for setting per component log level and infile options */  
   memset(logparams_level,    0, sizeof(paramdef_t)*MAX_LOG_PREDEF_COMPONENTS);
   memset(logparams_logfile,  0, sizeof(paramdef_t)*MAX_LOG_PREDEF_COMPONENTS);
-
   for (int i=MIN_LOG_COMPONENTS; i < MAX_LOG_PREDEF_COMPONENTS; i++) {
     if(g_log->log_component[i].name == NULL) {
-      g_log->log_component[i].name = malloc(16);
-      sprintf((char *)g_log->log_component[i].name,"comp%i?",i);
-      logparams_logfile[i].paramflags = PARAMFLAG_DONOTREAD;
-      logparams_level[i].paramflags = PARAMFLAG_DONOTREAD;
+       g_log->log_component[i].name = malloc(16);
+       sprintf((char *)g_log->log_component[i].name,"comp%i?",i);
+       logparams_logfile[i].paramflags = PARAMFLAG_DONOTREAD;
+       logparams_level[i].paramflags = PARAMFLAG_DONOTREAD;
     }
-
     sprintf(logparams_level[i].optname,    LOG_CONFIG_LEVEL_FORMAT,       g_log->log_component[i].name);
     sprintf(logparams_logfile[i].optname,  LOG_CONFIG_LOGFILE_FORMAT,     g_log->log_component[i].name);
-
-    /* workaround: all log options in existing configuration files use lower case component names
-       where component names include uppercase char in log.h....                                */
-    for (int j=0 ; j<strlen(logparams_level[i].optname); j++)
-      logparams_level[i].optname[j] = tolower(logparams_level[i].optname[j]);
-
-    for (int j=0 ; j<strlen(logparams_level[i].optname); j++)
-      logparams_logfile[i].optname[j] = tolower(logparams_logfile[i].optname[j]);
-
-    /* */
+/* workaround: all log options in existing configuration files use lower case component names
+   where component names include uppercase char in log.h....                                */ 
+    for (int j=0 ; j<strlen(logparams_level[i].optname); j++) 
+          logparams_level[i].optname[j] = tolower(logparams_level[i].optname[j]);
+    for (int j=0 ; j<strlen(logparams_level[i].optname); j++) 
+          logparams_logfile[i].optname[j] = tolower(logparams_logfile[i].optname[j]);
+/* */
     logparams_level[i].defstrval     = gloglevel;
     logparams_logfile[i].defuintval  = 0;
     logparams_logfile[i].numelt      = 0;
     logparams_level[i].numelt        = 0;
     logparams_level[i].type          = TYPE_STRING;
     logparams_logfile[i].type        = TYPE_UINT;
+
     logparams_logfile[i].paramflags  = logparams_logfile[i].paramflags|PARAMFLAG_BOOL;
-  }
-
-  /* read the per component parameters */
-  config_get( logparams_level,    MAX_LOG_PREDEF_COMPONENTS,CONFIG_STRING_LOG_PREFIX);
-  config_get( logparams_logfile,  MAX_LOG_PREDEF_COMPONENTS,CONFIG_STRING_LOG_PREFIX);
-
-  /* now set the log levels and infile option, according to what we read */
+    }
+/* read the per component parameters */
+  config_get( logparams_level,    MAX_LOG_PREDEF_COMPONENTS,CONFIG_STRING_LOG_PREFIX); 
+  config_get( logparams_logfile,  MAX_LOG_PREDEF_COMPONENTS,CONFIG_STRING_LOG_PREFIX); 
+/* now set the log levels and infile option, according to what we read */
   for (int i=MIN_LOG_COMPONENTS; i < MAX_LOG_PREDEF_COMPONENTS; i++) {
     g_log->log_component[i].level = map_str_to_int(log_level_names,    *(logparams_level[i].strptr));
     set_log(i, g_log->log_component[i].level);
-
     if (*(logparams_logfile[i].uptr) == 1)
-      set_component_filelog(i);
+        set_component_filelog(i);
   }
 
-  /* build then read the debug and dump parameter array */
-  for (int i=0; log_maskmap[i].name != NULL ; i++) {
-    sprintf(logparams_debug[i].optname,  LOG_CONFIG_DEBUG_FORMAT, log_maskmap[i].name);
-    sprintf(logparams_dump[i].optname,   LOG_CONFIG_DUMP_FORMAT, log_maskmap[i].name);
-    logparams_debug[i].defuintval  = 0;
-    logparams_debug[i].type        = TYPE_UINT;
-    logparams_debug[i].paramflags  = PARAMFLAG_BOOL;
-    logparams_debug[i].uptr        = NULL;
-    logparams_debug[i].chkPptr     = NULL;
-    logparams_debug[i].numelt      = 0;
-    logparams_dump[i].defuintval  = 0;
-    logparams_dump[i].type        = TYPE_UINT;
-    logparams_dump[i].paramflags  = PARAMFLAG_BOOL;
-    logparams_dump[i].uptr        = NULL;
-    logparams_dump[i].chkPptr     = NULL;
-    logparams_dump[i].numelt      = 0;
+/* build then read the debug and dump parameter array */
+  for (int i=0;log_maskmap[i].name != NULL ; i++) {
+      sprintf(logparams_debug[i].optname,  LOG_CONFIG_DEBUG_FORMAT, log_maskmap[i].name);
+      sprintf(logparams_dump[i].optname,   LOG_CONFIG_DUMP_FORMAT, log_maskmap[i].name);
+      logparams_debug[i].defuintval  = 0;
+      logparams_debug[i].type        = TYPE_UINT;
+      logparams_debug[i].paramflags  = PARAMFLAG_BOOL;
+      logparams_debug[i].uptr        = NULL;
+      logparams_debug[i].chkPptr     = NULL;
+      logparams_debug[i].numelt      = 0;
+      logparams_dump[i].defuintval  = 0;
+      logparams_dump[i].type        = TYPE_UINT;
+      logparams_dump[i].paramflags  = PARAMFLAG_BOOL;
+      logparams_dump[i].uptr        = NULL;
+      logparams_dump[i].chkPptr     = NULL;
+      logparams_dump[i].numelt      = 0;
   }
-
   config_get( logparams_debug,(sizeof(log_maskmap)/sizeof(mapping)) - 1 ,CONFIG_STRING_LOG_PREFIX);
   config_get( logparams_dump,(sizeof(log_maskmap)/sizeof(mapping)) - 1 ,CONFIG_STRING_LOG_PREFIX);
-  config_check_unknown_cmdlineopt(CONFIG_STRING_LOG_PREFIX);
-
-  /* set the debug mask according to the debug parameters values */
+/* set the debug mask according to the debug parameters values */
   for (int i=0; log_maskmap[i].name != NULL ; i++) {
     if (*(logparams_debug[i].uptr) )
-      g_log->debug_mask = g_log->debug_mask | log_maskmap[i].value;
-
+        g_log->debug_mask = g_log->debug_mask | log_maskmap[i].value;
     if (*(logparams_dump[i].uptr) )
-      g_log->dump_mask = g_log->dump_mask | log_maskmap[i].value;
-  }
-
-  /* log globally enabled/disabled */
+        g_log->dump_mask = g_log->dump_mask | log_maskmap[i].value;
+  } 
+/* log globally enabled/disabled */
   set_glog_onlinelog(consolelog);
 }
 
-int register_log_component(char *name, char *fext, int compidx) {
-  int computed_compidx=compidx;
+int register_log_component(char *name, char *fext, int compidx)
+{
+int computed_compidx=compidx;
 
   if (strlen(fext) > 3) {
-    fext[3]=0;  /* limit log file extension to 3 chars */
+      fext[3]=0;  /* limit log file extension to 3 chars */
   }
-
   if (compidx < 0) { /* this is not a pre-defined component */
-    for (int i = MAX_LOG_PREDEF_COMPONENTS; i< MAX_LOG_COMPONENTS; i++) {
-      if (g_log->log_component[i].name == NULL) {
-        computed_compidx=i;
-        break;
+      for (int i = MAX_LOG_PREDEF_COMPONENTS; i< MAX_LOG_COMPONENTS; i++) {
+            if (g_log->log_component[i].name == NULL) {
+                computed_compidx=i;
+                break;
+            }
       }
-    }
   }
-
   if (computed_compidx >= 0 && computed_compidx <MAX_LOG_COMPONENTS) {
-    g_log->log_component[computed_compidx].name = strdup(name);
-    g_log->log_component[computed_compidx].stream = stdout;
-    g_log->log_component[computed_compidx].filelog = 0;
-    g_log->log_component[computed_compidx].filelog_name = malloc(strlen(name)+16);/* /tmp/<name>.%s  */
-    sprintf(g_log->log_component[computed_compidx].filelog_name,"/tmp/%s.%s",name,fext);
+      g_log->log_component[computed_compidx].name = strdup(name);
+      g_log->log_component[computed_compidx].stream = stdout;
+      g_log->log_component[computed_compidx].filelog = 0;
+      g_log->log_component[computed_compidx].filelog_name = malloc(strlen(name)+16);/* /tmp/<name>.%s  */
+      sprintf(g_log->log_component[computed_compidx].filelog_name,"/tmp/%s.%s",name,fext);
   } else {
-    fprintf(stderr,"{LOG} %s %d Couldn't register componemt %s\n",__FILE__,__LINE__,name);
+      fprintf(stderr,"{LOG} %s %d Couldn't register componemt %s\n",__FILE__,__LINE__,name);
   }
-
-  return computed_compidx;
+return computed_compidx;
 }
 
-int isLogInitDone (void) {
-  if (g_log == NULL)
-    return 0;
-
-  if (!(g_log->flag & FLAG_INITIALIZED))
-    return 0;
-
-  return 1;
-}
-
-int logInit (void) {
+int logInit (void)
+{
   int i;
   g_log = calloc(1, sizeof(log_t));
 
@@ -367,8 +367,10 @@ int logInit (void) {
     perror ("cannot allocated memory for log generation module \n");
     exit(EXIT_FAILURE);
   }
-
   memset(g_log,0,sizeof(log_t));
+
+
+
   register_log_component("PHY","log",PHY);
   register_log_component("MAC","log",MAC);
   register_log_component("OPT","log",OPT);
@@ -384,121 +386,143 @@ int logInit (void) {
   register_log_component("OTG_JITTER","dat",OTG_JITTER);
   register_log_component("OCG","",OCG);
   register_log_component("PERF","",PERF);
-  register_log_component("OIP","",OIP);
-  register_log_component("CLI","",CLI);
-  register_log_component("MSC","log",MSC);
-  register_log_component("OCM","log",OCM);
-  register_log_component("HW","",HW);
-  register_log_component("OSA","",OSA);
-  register_log_component("eRAL","",RAL_ENB);
-  register_log_component("mRAL","",RAL_UE);
-  register_log_component("ENB_APP","log",ENB_APP);
-  register_log_component("FLEXRAN_AGENT","log",FLEXRAN_AGENT);
-  register_log_component("TMR","",TMR);
-  register_log_component("USIM","txt",USIM);
-  register_log_component("SIM","txt",SIM);
+  register_log_component("OIP","",OIP); 
+  register_log_component("CLI","",CLI); 
+  register_log_component("MSC","log",MSC); 
+  register_log_component("OCM","log",OCM); 
+  register_log_component("HW","",HW); 
+  register_log_component("OSA","",OSA); 
+  register_log_component("eRAL","",RAL_ENB); 
+  register_log_component("mRAL","",RAL_UE); 
+  register_log_component("ENB_APP","log",ENB_APP); 
+  register_log_component("FLEXRAN_AGENT","log",FLEXRAN_AGENT); 
+  register_log_component("TMR","",TMR); 
+  register_log_component("USIM","txt",USIM);   
+  register_log_component("SIM","txt",SIM);  
+
   /* following log component are used for the localization*/
   register_log_component("LOCALIZE","log",LOCALIZE);
   register_log_component("NAS","log",NAS);
   register_log_component("UDP","",UDP_);
+
+
   register_log_component("GTPV1U","",GTPU);
+
+
   register_log_component("S1AP","",S1AP);
   register_log_component("X2AP","",X2AP);
+
+
   register_log_component("SCTP","",SCTP);
   register_log_component("X2AP","",X2AP);
   register_log_component("LOADER","log",LOADER);
   register_log_component("ASN","log",ASN);
+  
+
 
   for (int i=0 ; log_level_names[i].name != NULL ; i++)
-    g_log->level2string[i]           = toupper(log_level_names[i].name[0]); // uppercased first letter of level name
+      g_log->level2string[i]           = toupper(log_level_names[i].name[0]); // uppercased first letter of level name
+
+
+ 
+
 
   g_log->filelog_name = "/tmp/openair.log";
+
   log_getconfig(g_log);
 
+
+
   // set all unused component items to 0, they are for non predefined components
   for (i=MAX_LOG_PREDEF_COMPONENTS; i < MAX_LOG_COMPONENTS; i++) {
-    memset(&(g_log->log_component[i]),0,sizeof(log_component_t));
+        memset(&(g_log->log_component[i]),0,sizeof(log_component_t));
   }
-
-  g_log->flag =  g_log->flag | FLAG_INITIALIZED;
   printf("log init done\n");
+
   return 0;
 }
 
 
 char *log_getthreadname(char *threadname, int bufsize) {
-  int rt =   pthread_getname_np(pthread_self(), threadname,bufsize) ;
 
-  if (rt == 0) {
-    return threadname;
-  } else {
-    return "thread?";
-  }
+int rt =   pthread_getname_np(pthread_self(), threadname,bufsize) ;  
+   if (rt == 0)
+   {
+     return threadname;
+   } else {
+     return "thread?";
+   }
 }
 
 static int log_header(char *log_buffer, int buffsize, int comp, int level,const char *format) {
   char threadname[PR_SET_NAME];
-  return  snprintf(log_buffer, buffsize , "%s%s[%s]%c %s %s%s",
-                   log_level_highlight_end[level],
-                   ( (g_log->flag & FLAG_NOCOLOR)?"":log_level_highlight_start[level]),
-                   g_log->log_component[comp].name,
-                   ( (g_log->flag & FLAG_LEVEL)?g_log->level2string[level]:' '),
-                   ( (g_log->flag & FLAG_THREAD)?log_getthreadname(threadname,PR_SET_NAME+1):""),
-                   format,
-                   log_level_highlight_end[level]);
+return  snprintf(log_buffer, buffsize , "%s%s[%s]%c %s %s%s",
+  	   log_level_highlight_end[level],
+  	   ( (g_log->flag & FLAG_NOCOLOR)?"":log_level_highlight_start[level]),
+  	   g_log->log_component[comp].name,
+  	   ( (g_log->flag & FLAG_LEVEL)?g_log->level2string[level]:' '),
+  	   ( (g_log->flag & FLAG_THREAD)?log_getthreadname(threadname,PR_SET_NAME+1):""),
+  	   format,
+           log_level_highlight_end[level]);
 }
 
-void logRecord_mt(const char *file, const char *func, int line, int comp, int level, const char *format, ... ) {
+void logRecord_mt(const char *file, const char *func, int line, int comp, int level, const char* format, ... )
+  {
   char log_buffer[MAX_LOG_TOTAL];
   va_list args;
+
   va_start(args, format);
+
+
+
+
   log_header(log_buffer,MAX_LOG_TOTAL ,comp, level,format);
   g_log->log_component[comp].vprint(g_log->log_component[comp].stream,log_buffer, args);
   va_end(args);
+
+
 }
 
-void log_dump(int component, void *buffer, int buffsize,int datatype, const char *format, ... ) {
-  va_list args;
-  char *wbuf;
+void log_dump(int component, void *buffer, int buffsize,int datatype, const char* format, ... ) {
+va_list args;
+char *wbuf; 
 
-  switch(datatype) {
-    case LOG_DUMP_DOUBLE:
-      wbuf=malloc((buffsize * 10)  + 64 + MAX_LOG_TOTAL);
-      break;
 
-    case LOG_DUMP_CHAR:
-    default:
-      wbuf=malloc((buffsize * 3 ) + 64 + MAX_LOG_TOTAL);
-      break;
-  }
-
-  if (wbuf != NULL) {
-    va_start(args, format);
-    int pos=log_header(wbuf,MAX_LOG_TOTAL ,component, OAILOG_INFO,"");
-    int pos2=vsprintf(wbuf+pos,format, args);
-    pos=pos+pos2;
-    va_end(args);
-
-    for (int i=0; i<buffsize; i++) {
-      switch(datatype) {
-        case LOG_DUMP_DOUBLE:
-          pos = pos + sprintf(wbuf+pos,"%04.4lf ", (double)((double *)buffer)[i]);
-          break;
-
-        case LOG_DUMP_CHAR:
-        default:
-          pos = pos + sprintf(wbuf+pos,"%02x ", (unsigned char)((unsigned char *)buffer)[i]);
-          break;
-      }
+    switch(datatype) {
+       case LOG_DUMP_DOUBLE:
+            wbuf=malloc((buffsize * 10)  + 64 + MAX_LOG_TOTAL);
+       break;
+       case LOG_DUMP_CHAR:
+       default:
+            wbuf=malloc((buffsize * 3 ) + 64 + MAX_LOG_TOTAL);
+       break;
     }
-
+    if (wbuf != NULL) {       
+       va_start(args, format);
+       int pos=log_header(wbuf,MAX_LOG_TOTAL ,component, OAILOG_INFO,"");
+       int pos2=vsprintf(wbuf+pos,format, args);
+       pos=pos+pos2;
+       va_end(args);
+      
+       for (int i=0; i<buffsize; i++) {
+            switch(datatype) {
+               case LOG_DUMP_DOUBLE:
+                    pos = pos + sprintf(wbuf+pos,"%04.4lf ", (double)((double *)buffer)[i]);
+               break;
+               case LOG_DUMP_CHAR:
+               default:
+                    pos = pos + sprintf(wbuf+pos,"%02x ", (unsigned char)((unsigned char *)buffer)[i]);
+               break;
+            }        
+       }
     sprintf(wbuf+pos,"\n");
     g_log->log_component[component].print(g_log->log_component[component].stream,wbuf);
     free(wbuf);
-  }
+    } 
 }
 
-int set_log(int component, int level) {
+int set_log(int component, int level)
+{
   /* Checking parameters */
   DevCheck((component >= MIN_LOG_COMPONENTS) && (component < MAX_LOG_COMPONENTS),
            component, MIN_LOG_COMPONENTS, MAX_LOG_COMPONENTS);
@@ -506,34 +530,38 @@ int set_log(int component, int level) {
            OAILOG_ERR);
 
   if ( g_log->log_component[component].level != OAILOG_DISABLE )
-    g_log->log_component[component].savedlevel = g_log->log_component[component].level;
-
+      g_log->log_component[component].savedlevel = g_log->log_component[component].level;
   g_log->log_component[component].level = level;
+
   return 0;
 }
 
 
 
-void set_glog(int level) {
+void set_glog(int level)
+{
   for (int c=0; c< MAX_LOG_COMPONENTS; c++ ) {
-    set_log(c, level);
+     set_log(c, level);
   }
+  
 }
 
-void set_glog_onlinelog(int enable) {
+void set_glog_onlinelog(int enable)
+{
   for (int c=0; c< MAX_LOG_COMPONENTS; c++ ) {
-    if ( enable ) {
-      g_log->log_component[c].level = g_log->log_component[c].savedlevel;
-      g_log->log_component[c].vprint = vfprintf;
-      g_log->log_component[c].print = fprintf;
-      g_log->log_component[c].stream = stdout;
-    } else {
-      g_log->log_component[c].level = OAILOG_DISABLE;
-    }
-  }
+      if ( enable ) {
+        g_log->log_component[c].level = g_log->log_component[c].savedlevel;
+        g_log->log_component[c].vprint = vfprintf;
+        g_log->log_component[c].print = fprintf;
+        g_log->log_component[c].stream = stdout;
+      } else {
+        g_log->log_component[c].level = OAILOG_DISABLE;
+      }
+  }  
 }
-void set_glog_filelog(int enable) {
-  static FILE *fptr;
+void set_glog_filelog(int enable)
+{
+static FILE *fptr;
 
   if ( enable ) {
     fptr = fopen(g_log->filelog_name,"w");
@@ -546,35 +574,33 @@ void set_glog_filelog(int enable) {
   } else {
     for (int c=0; c< MAX_LOG_COMPONENTS; c++ ) {
       g_log->log_component[c].filelog =  0;
-
       if (fptr != NULL) {
         fclose(fptr);
       }
-
       g_log->log_component[c].stream = stdout;
+    }    
+  }  
+}
+
+void set_component_filelog(int comp)
+{
+    if (g_log->log_component[comp].stream == NULL || g_log->log_component[comp].stream == stdout) {
+      g_log->log_component[comp].stream = fopen(g_log->log_component[comp].filelog_name,"w");
     }
-  }
+    g_log->log_component[comp].vprint = vfprintf;
+    g_log->log_component[comp].print = fprintf;
+    g_log->log_component[comp].filelog =  1;
 }
-
-void set_component_filelog(int comp) {
-  if (g_log->log_component[comp].stream == NULL || g_log->log_component[comp].stream == stdout) {
-    g_log->log_component[comp].stream = fopen(g_log->log_component[comp].filelog_name,"w");
-  }
-
-  g_log->log_component[comp].vprint = vfprintf;
-  g_log->log_component[comp].print = fprintf;
-  g_log->log_component[comp].filelog =  1;
-}
-void close_component_filelog(int comp) {
-  g_log->log_component[comp].filelog =  0;
-
-  if (g_log->log_component[comp].stream != NULL && g_log->log_component[comp].stream != stdout ) {
-    fclose(g_log->log_component[comp].stream);
-    g_log->log_component[comp].stream = stdout;
-  }
-
-  g_log->log_component[comp].vprint = vfprintf;
-  g_log->log_component[comp].print = fprintf;
+void close_component_filelog(int comp)
+{
+    g_log->log_component[comp].filelog =  0;
+    if (g_log->log_component[comp].stream != NULL && g_log->log_component[comp].stream != stdout ) {
+      fclose(g_log->log_component[comp].stream);
+      g_log->log_component[comp].stream = stdout;
+    }
+    g_log->log_component[comp].vprint = vfprintf;
+    g_log->log_component[comp].print = fprintf;
+ 
 }
 
 /*
@@ -582,7 +608,8 @@ void close_component_filelog(int comp) {
  * with string value NULL
  */
 /* map a string to an int. Takes a mapping array and a string as arg */
-int map_str_to_int(mapping *map, const char *str) {
+int map_str_to_int(mapping *map, const char *str)
+{
   while (1) {
     if (map->name == NULL) {
       return(-1);
@@ -597,7 +624,8 @@ int map_str_to_int(mapping *map, const char *str) {
 }
 
 /* map an int to a string. Takes a mapping array and a value */
-char *map_int_to_str(mapping *map, int val) {
+char *map_int_to_str(mapping *map, int val)
+{
   while (1) {
     if (map->name == NULL) {
       return NULL;
@@ -611,7 +639,8 @@ char *map_int_to_str(mapping *map, int val) {
   }
 }
 
-int is_newline( char *str, int size) {
+int is_newline( char *str, int size)
+{
   int i;
 
   for (  i = 0; i < size; i++ ) {
@@ -624,65 +653,85 @@ int is_newline( char *str, int size) {
   return 0;
 }
 
-void logClean (void) {
+void logClean (void)
+{
   int i;
+  LOG_UI(PHY,"\n");
 
-  if(isLogInitDone()) {
-    LOG_UI(PHY,"\n");
 
-    for (i=MIN_LOG_COMPONENTS; i < MAX_LOG_COMPONENTS; i++) {
-      close_component_filelog(i);
-    }
+
+
+  for (i=MIN_LOG_COMPONENTS; i < MAX_LOG_COMPONENTS; i++) {
+     close_component_filelog(i);
   }
 }
 
-
+  
 #ifdef LOG_TEST
 
-int main(int argc, char *argv[]) {
+int main(int argc, char *argv[])
+{
+
   logInit();
+
+
   test_log();
+
   return 1;
 }
 
-int test_log(void) {
+int test_log(void)
+{
   LOG_ENTER(MAC); // because the default level is DEBUG
   LOG_I(EMU, "1 Starting OAI logs version %s Build date: %s on %s\n",
         BUILD_VERSION, BUILD_DATE, BUILD_HOST);
   LOG_D(MAC, "1 debug  MAC \n");
   LOG_W(MAC, "1 warning MAC \n");
+
   set_log(EMU, OAILOG_INFO);
   set_log(MAC, OAILOG_WARNING);
+
   LOG_I(EMU, "2 Starting OAI logs version %s Build date: %s on %s\n",
         BUILD_VERSION, BUILD_DATE, BUILD_HOST);
   LOG_E(MAC, "2 error MAC\n");
   LOG_D(MAC, "2 debug  MAC \n");
   LOG_W(MAC, "2 warning MAC \n");
   LOG_I(MAC, "2 info MAC \n");
+
+
   set_log(MAC, OAILOG_NOTICE);
+
   LOG_ENTER(MAC);
   LOG_I(EMU, "3 Starting OAI logs version %s Build date: %s on %s\n",
         BUILD_VERSION, BUILD_DATE, BUILD_HOST);
   LOG_D(MAC, "3 debug  MAC \n");
   LOG_W(MAC, "3 warning MAC \n");
   LOG_I(MAC, "3 info MAC \n");
+
   set_log(MAC, LOG_DEBUG);
   set_log(EMU, LOG_DEBUG);
+
   LOG_ENTER(MAC);
   LOG_I(EMU, "4 Starting OAI logs version %s Build date: %s on %s\n",
         BUILD_VERSION, BUILD_DATE, BUILD_HOST);
   LOG_D(MAC, "4 debug  MAC \n");
   LOG_W(MAC, "4 warning MAC \n");
   LOG_I(MAC, "4 info MAC \n");
+
+
   set_log(MAC, LOG_DEBUG);
   set_log(EMU, LOG_DEBUG);
+
   LOG_I(LOG, "5 Starting OAI logs version %s Build date: %s on %s\n",
         BUILD_VERSION, BUILD_DATE, BUILD_HOST);
   LOG_D(MAC, "5 debug  MAC \n");
   LOG_W(MAC, "5 warning MAC \n");
   LOG_I(MAC, "5 info MAC \n");
+
+
   set_log(MAC, LOG_TRACE);
   set_log(EMU, LOG_TRACE);
+
   LOG_ENTER(MAC);
   LOG_I(LOG, "6 Starting OAI logs version %s Build date: %s on %s\n",
         BUILD_VERSION, BUILD_DATE, BUILD_HOST);
@@ -690,6 +739,7 @@ int test_log(void) {
   LOG_W(MAC, "6 warning MAC \n");
   LOG_I(MAC, "6 info MAC \n");
   LOG_EXIT(MAC);
+
   return 0;
 }
 #endif

common/utils/LOG/log.h

@@ -45,11 +45,11 @@
 #include <time.h>
 #include <stdint.h>
 #ifndef __STDC_FORMAT_MACROS
-  #define __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
 #endif
 #include <inttypes.h>
 #ifndef _GNU_SOURCE
-  #define _GNU_SOURCE
+#define _GNU_SOURCE
 #endif
 #include <pthread.h>
 #include "T.h"
@@ -115,22 +115,23 @@ extern "C" {
  * @{*/
 
 
-#define FLAG_NOCOLOR     0x0001  /*!< \brief use colors in log messages, depending on level */
-#define FLAG_THREAD      0x0008  /*!< \brief display thread name in log messages */
-#define FLAG_LEVEL       0x0010  /*!< \brief display log level in log messages */
-#define FLAG_TIME        0x0100
-#define FLAG_INITIALIZED 0x8000
+#define FLAG_NOCOLOR   0x0001  /*!< \brief use colors in log messages, depending on level */
+#define FLAG_THREAD    0x0008  /*!< \brief display thread name in log messages */
+#define FLAG_LEVEL     0x0010  /*!< \brief display log level in log messages */
+#define FLAG_FUNCT     0x0020
+#define FLAG_FILE_LINE 0x0040
+#define FLAG_TIME      0x0100
 
 #define SET_LOG_OPTION(O)   g_log->flag = (g_log->flag | O)
 #define CLEAR_LOG_OPTION(O) g_log->flag = (g_log->flag & (~O))
 
 /** @defgroup macros to identify a debug entity
  *  @ingroup each macro is a bit mask where the unique bit set identifies an entity to be debugged
- *            it allows to dynamically activate or not blocks of code. The  LOG_MASKMAP_INIT macro
+ *            it allows to dynamically activate or not blocks of code. The  LOG_MASKMAP_INIT macro 
  *            is used to map a character string name to each debug bit, it allows to set or clear
  *            the corresponding bit via the defined name, from the configuration or from the telnet
  *            server.
- *  @brief
+ *  @brief 
  * @{*/
 #define DEBUG_PRACH        (1<<0)
 #define DEBUG_RU           (1<<1)
@@ -145,28 +146,26 @@ extern "C" {
 #define DEBUG_CTRLSOCKET   (1<<10)
 #define DEBUG_SECURITY     (1<<11)
 #define DEBUG_NAS          (1<<12)
-#define DEBUG_RLC          (1<<13)
 #define UE_TIMING          (1<<20)
 
 
 #define LOG_MASKMAP_INIT {\
-    {"PRACH",       DEBUG_PRACH},\
-    {"RU",          DEBUG_RU},\
-    {"UE_PHYPROC",  DEBUG_UE_PHYPROC},\
-    {"LTEESTIM",    DEBUG_LTEESTIM},\
-    {"DLCELLSPEC",  DEBUG_DLCELLSPEC},\
-    {"ULSCH",       DEBUG_ULSCH},\
-    {"RRC",         DEBUG_RRC},\
-    {"PDCP",        DEBUG_PDCP},\
-    {"DFT",         DEBUG_DFT},\
-    {"ASN1",        DEBUG_ASN1},\
-    {"CTRLSOCKET",  DEBUG_CTRLSOCKET},\
-    {"SECURITY",    DEBUG_SECURITY},\
-    {"NAS",         DEBUG_NAS},\
-    {"RLC",         DEBUG_RLC},\
-    {"UE_TIMING",   UE_TIMING},\
-    {NULL,-1}\
-  }
+  {"PRACH",       DEBUG_PRACH},\
+  {"RU",          DEBUG_RU},\
+  {"UE_PHYPROC",  DEBUG_UE_PHYPROC},\
+  {"LTEESTIM",    DEBUG_LTEESTIM},\
+  {"DLCELLSPEC",  DEBUG_DLCELLSPEC},\
+  {"ULSCH",       DEBUG_ULSCH},\
+  {"RRC",         DEBUG_RRC},\
+  {"PDCP",        DEBUG_PDCP},\
+  {"DFT",         DEBUG_DFT},\
+  {"ASN1",        DEBUG_ASN1},\
+  {"CTRLSOCKET",  DEBUG_CTRLSOCKET},\
+  {"SECURITY",    DEBUG_SECURITY},\
+  {"NAS",         DEBUG_NAS},\
+  {"UE_TIMING",   UE_TIMING},\
+  {NULL,-1}\
+}
 
 
 
@@ -179,46 +178,46 @@ extern "C" {
 
 
 typedef enum {
-  MIN_LOG_COMPONENTS = 0,
-  PHY = MIN_LOG_COMPONENTS,
-  MAC,
-  SIM,
-  OCG,
-  OMG,
-  OPT,
-  OTG,
-  OTG_LATENCY,
-  OTG_LATENCY_BG,
-  OTG_GP,
-  OTG_GP_BG,
-  OTG_JITTER,
-  RLC,
-  PDCP,
-  RRC,
-  NAS,
-  PERF,
-  OIP,
-  CLI,
-  MSC,
-  OCM,
-  UDP_,
-  GTPU,
-  SPGW,
-  S1AP,
-  SCTP,
-  HW,
-  OSA,
-  RAL_ENB,
-  RAL_UE,
-  ENB_APP,
-  FLEXRAN_AGENT,
-  TMR,
-  USIM,
-  LOCALIZE,
-  X2AP,
-  LOADER,
-  ASN,
-  MAX_LOG_PREDEF_COMPONENTS,
+    MIN_LOG_COMPONENTS = 0,
+    PHY = MIN_LOG_COMPONENTS,
+    MAC,
+    SIM,
+    OCG,
+    OMG,
+    OPT,
+    OTG,
+    OTG_LATENCY,
+    OTG_LATENCY_BG,
+    OTG_GP,
+    OTG_GP_BG,
+    OTG_JITTER,
+    RLC,
+    PDCP,
+    RRC,
+    NAS,
+    PERF,
+    OIP,
+    CLI,
+    MSC,
+    OCM,
+    UDP_,
+    GTPU,
+    SPGW,
+    S1AP,
+    SCTP,
+    HW,
+    OSA,
+    RAL_ENB,
+    RAL_UE,
+    ENB_APP,
+    FLEXRAN_AGENT,
+    TMR,
+    USIM,
+    LOCALIZE,
+    X2AP,
+    LOADER,
+    ASN,
+    MAX_LOG_PREDEF_COMPONENTS,
 }
 comp_name_t;
 
@@ -227,42 +226,42 @@ comp_name_t;
 
 
 typedef struct {
-  char *name; /*!< \brief string name of item */
-  int value;  /*!< \brief integer value of mapping */
+    char *name; /*!< \brief string name of item */
+    int value;  /*!< \brief integer value of mapping */
 } mapping;
 
 typedef int(*log_vprint_func_t)(FILE *stream, const char *format, va_list ap );
 typedef int(*log_print_func_t)(FILE *stream, const char *format, ... );
 typedef struct  {
-  const char        *name;
-  int               level;
-  int               savedlevel;
-  int               flag;
-  int               filelog;
-  char              *filelog_name;
-  FILE              *stream;
-  log_vprint_func_t vprint;
-  log_print_func_t  print;
-  /* SR: make the log buffer component relative */
-  char             log_buffer[MAX_LOG_TOTAL];
+    const char        *name;
+    int               level;
+    int               savedlevel;
+    int               flag;
+    int               filelog;
+    char              *filelog_name;
+    FILE              *stream;
+    log_vprint_func_t vprint;
+    log_print_func_t  print;
+    /* SR: make the log buffer component relative */
+    char             log_buffer[MAX_LOG_TOTAL];
 } log_component_t;
 
 
 typedef struct {
-  log_component_t         log_component[MAX_LOG_COMPONENTS];
-  char                    level2string[NUM_LOG_LEVEL];
-  int                     flag;
-  char                   *filelog_name;
-  uint64_t                debug_mask;
-  uint64_t                dump_mask;
+    log_component_t         log_component[MAX_LOG_COMPONENTS];
+    char                    level2string[NUM_LOG_LEVEL];
+    int                     flag;
+    char*                   filelog_name;
+    uint64_t                debug_mask;
+    uint64_t                dump_mask;
 } log_t;
 
 
 #if defined(ENABLE_ITTI)
 typedef enum log_instance_type_e {
-  LOG_INSTANCE_UNKNOWN,
-  LOG_INSTANCE_ENB,
-  LOG_INSTANCE_UE,
+    LOG_INSTANCE_UNKNOWN,
+    LOG_INSTANCE_ENB,
+    LOG_INSTANCE_UE,
 } log_instance_type_t;
 
 void log_set_instance_type (log_instance_type_t instance);
@@ -273,9 +272,9 @@ void log_set_instance_type (log_instance_type_t instance);
 log_t *g_log;
 #else
 #ifdef __cplusplus
-extern "C" {
+   extern "C" {
 #endif
-  extern log_t *g_log;
+extern log_t *g_log;
 #ifdef __cplusplus
 }
 #endif
@@ -284,9 +283,8 @@ extern "C" {
 #    include "log_if.h"
 /*----------------------------------------------------------------------------*/
 int  logInit (void);
-int isLogInitDone (void);
 void logRecord_mt(const char *file, const char *func, int line,int comp, int level, const char *format, ...) __attribute__ ((format (printf, 6, 7)));
-void log_dump(int component, void *buffer, int buffsize,int datatype, const char *format, ... );
+void log_dump(int component, void *buffer, int buffsize,int datatype, const char* format, ... );
 int  set_log(int component, int level);
 void set_glog(int level);
 
@@ -329,26 +327,24 @@ int32_t write_file_matlab(const char *fname, const char *vname, void *data, int
 #define LOG_CONFIG_DUMP_FORMAT                             "%s_dump"
 
 #define LOG_CONFIG_HELP_OPTIONS      " list of comma separated options to enable log module behavior. Available options: \n"\
-  " nocolor:   disable color usage in log messages\n"\
-  " level:     add log level indication in log messages\n"\
-  " thread:    add threads names in log messages\n"
-
-
+                                     " nocolor:   disable color usage in log messages\n"\
+				     " level:     add log level indication in log messages\n"\
+				     " thread:    add threads names in log messages\n"
+				     
 
 
+                   
 /*------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
-/*                                       LOG globalconfiguration parameters                                                                   */
-/*   optname                            help                                                paramflags       XXXptr                    defXXXval              type   numelt */
+/*                                       LOG globalconfiguration parameters										                                                */
+/*   optname                            help                                                paramflags       XXXptr	                   defXXXval				      type	 numelt	*/
 /*------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
 #define LOG_GLOBALPARAMS_DESC { \
-    {LOG_CONFIG_STRING_GLOBAL_LOG_LEVEL,    "Default log level for all componemts\n",              0,         strptr:(char **)&gloglevel,    defstrval:log_level_names[2].name,    TYPE_STRING,    0}, \
-    {LOG_CONFIG_STRING_GLOBAL_LOG_ONLINE,   "Default console output option, for all components\n", 0,         iptr:&(consolelog),            defintval:1,                          TYPE_INT,       0}, \
-    {LOG_CONFIG_STRING_GLOBAL_LOG_OPTIONS,  LOG_CONFIG_HELP_OPTIONS,                               0,         strlistptr:NULL,               defstrlistval:NULL,                   TYPE_STRINGLIST,0} \
-  }
+{LOG_CONFIG_STRING_GLOBAL_LOG_LEVEL,    "Default log level for all componemts\n",              0,  	      strptr:(char **)&gloglevel,    defstrval:log_level_names[2].name,    TYPE_STRING,    0}, \
+{LOG_CONFIG_STRING_GLOBAL_LOG_ONLINE,   "Default console output option, for all components\n", 0,  	      iptr:&(consolelog),            defintval:1,                          TYPE_INT,       0}, \
+{LOG_CONFIG_STRING_GLOBAL_LOG_OPTIONS,  LOG_CONFIG_HELP_OPTIONS,                               0,  	      strlistptr:NULL,               defstrlistval:NULL,                   TYPE_STRINGLIST,0} \
+}
 
 #define LOG_OPTIONS_IDX   2
-
-
 /*----------------------------------------------------------------------------------*/
 /** @defgroup _debugging debugging macros
  *  @ingroup _macro
@@ -358,23 +354,23 @@ int32_t write_file_matlab(const char *fname, const char *vname, void *data, int
 #define LOG_DUMP_DOUBLE     1
 // debugging macros
 #define LOG_F  LOG_I           /* because  LOG_F was originaly to dump a message or buffer but is also used as a regular level...., to dump use LOG_DUMPMSG */
-#  if T_TRACER
-/* per component, level dependant macros */
-#    define LOG_E(c, x...) do { if (T_stdout) { if( g_log->log_component[c].level >= OAILOG_ERR    ) logRecord_mt(__FILE__, __FUNCTION__, __LINE__,c, OAILOG_ERR, x)     ;} else { T(T_LEGACY_ ## c ## _ERROR, T_PRINTF(x))   ;}} while (0)
-#    define LOG_W(c, x...) do { if (T_stdout) { if( g_log->log_component[c].level >= OAILOG_WARNING) logRecord_mt(__FILE__, __FUNCTION__, __LINE__,c, OAILOG_WARNING, x) ;} else { T(T_LEGACY_ ## c ## _WARNING, T_PRINTF(x)) ;}} while (0)
-#    define LOG_I(c, x...) do { if (T_stdout) { if( g_log->log_component[c].level >= OAILOG_INFO   ) logRecord_mt(__FILE__, __FUNCTION__, __LINE__,c, OAILOG_INFO, x)    ;} else { T(T_LEGACY_ ## c ## _INFO, T_PRINTF(x))    ;}} while (0)
-#    define LOG_D(c, x...) do { if (T_stdout) { if( g_log->log_component[c].level >= OAILOG_DEBUG  ) logRecord_mt(__FILE__, __FUNCTION__, __LINE__,c, OAILOG_DEBUG, x)   ;} else { T(T_LEGACY_ ## c ## _DEBUG, T_PRINTF(x))   ;}} while (0)
-#    define LOG_T(c, x...) do { if (T_stdout) { if( g_log->log_component[c].level >= OAILOG_TRACE  ) logRecord_mt(__FILE__, __FUNCTION__, __LINE__,c, OAILOG_TRACE, x)   ;} else { T(T_LEGACY_ ## c ## _TRACE, T_PRINTF(x))   ;}} while (0)
-/* macro used to dump a buffer or a message as in openair2/RRC/LTE/RRC_eNB.c, replaces LOG_F macro */
+#  if T_TRACER 
+     /* per component, level dependant macros */
+#    define LOG_E(c, x...) do { if (T_stdout) { if( g_log->log_component[c].level >= OAILOG_ERR    ) logRecord_mt(__FILE__, __FUNCTION__, __LINE__,c, OAILOG_ERR, x)     ;} else { T(T_LEGACY_ ## c ## _ERROR, T_PRINTF(x))   ;}} while (0) 
+#    define LOG_W(c, x...) do { if (T_stdout) { if( g_log->log_component[c].level >= OAILOG_WARNING) logRecord_mt(__FILE__, __FUNCTION__, __LINE__,c, OAILOG_WARNING, x) ;} else { T(T_LEGACY_ ## c ## _WARNING, T_PRINTF(x)) ;}} while (0) 
+#    define LOG_I(c, x...) do { if (T_stdout) { if( g_log->log_component[c].level >= OAILOG_INFO   ) logRecord_mt(__FILE__, __FUNCTION__, __LINE__,c, OAILOG_INFO, x)    ;} else { T(T_LEGACY_ ## c ## _INFO, T_PRINTF(x))    ;}} while (0) 
+#    define LOG_D(c, x...) do { if (T_stdout) { if( g_log->log_component[c].level >= OAILOG_DEBUG  ) logRecord_mt(__FILE__, __FUNCTION__, __LINE__,c, OAILOG_DEBUG, x)   ;} else { T(T_LEGACY_ ## c ## _DEBUG, T_PRINTF(x))   ;}} while (0) 
+#    define LOG_T(c, x...) do { if (T_stdout) { if( g_log->log_component[c].level >= OAILOG_TRACE  ) logRecord_mt(__FILE__, __FUNCTION__, __LINE__,c, OAILOG_TRACE, x)   ;} else { T(T_LEGACY_ ## c ## _TRACE, T_PRINTF(x))   ;}} while (0) 
+    /* macro used to dump a buffer or a message as in openair2/RRC/LTE/RRC_eNB.c, replaces LOG_F macro */
 #    define LOG_DUMPMSG(c, f, b, s, x...) do {  if(g_log->dump_mask & f) log_dump(c, b, s, LOG_DUMP_CHAR, x)  ;}   while (0)  /* */
 #    define nfapi_log(FILE, FNC, LN, COMP, LVL, F...)  do { if (T_stdout) { logRecord_mt(__FILE__, __FUNCTION__, __LINE__,COMP, LVL, F)  ;}}   while (0)  /* */
-/* bitmask dependant macros, to isolate debugging code */
+     /* bitmask dependant macros, to isolate debugging code */
 #    define LOG_DEBUGFLAG(D) (g_log->debug_mask & D)
 
-/* bitmask dependant macros, to generate debug file such as matlab file or message dump */
+     /* bitmask dependant macros, to generate debug file such as matlab file or message dump */
 #    define LOG_DUMPFLAG(D) (g_log->dump_mask & D)
 #    define LOG_M(file, vector, data, len, dec, format) do { write_file_matlab(file, vector, data, len, dec, format);} while(0)/* */
-/* define variable only used in LOG macro's */
+     /* define variable only used in LOG macro's */
 #    define LOG_VAR(A,B) A B
 #  else /* T_TRACER: remove all debugging and tracing messages, except errors */
 #    define LOG_I(c, x...) /* */
@@ -384,15 +380,15 @@ int32_t write_file_matlab(const char *fname, const char *vname, void *data, int
 #    define LOG_T(c, x...) /* */
 
 #    define LOG_DUMPMSG(c, b, s, x...) /* */
-#    define nfapi_log(FILE, FNC, LN, COMP, LVL, FMT...)
+#    define nfapi_log(FILE, FNC, LN, COMP, LVL, FMT...) 
 #    define LOG_DEBUGFLAG(D)  ( 0 )
-#    define LOG_DUMPFLAG(D) ( 0 )
-#    define LOG_M(file, vector, data, len, dec, format)
+#    define LOG_DUMPFLAG(D) ( 0 ) 
+#    define LOG_M(file, vector, data, len, dec, format) 
 #    define LOG_VAR(A,B)
 #  endif /* T_TRACER */
 /* avoid warnings for variables only used in LOG macro's but set outside debug section */
-#define GCC_NOTUSED   __attribute__((unused))
-#define LOG_USEDINLOG_VAR(A,B) GCC_NOTUSED A B
+#define	GCC_NOTUSED		__attribute__((unused))
+#define LOG_USEDINLOG_VAR(A,B) GCC_NOTUSED A B 
 
 /* unfiltered macros, usefull for simulators or messages at init time, before log is configured */
 #define LOG_UM(file, vector, data, len, dec, format) do { write_file_matlab(file, vector, data, len, dec, format);} while(0)
@@ -424,82 +420,78 @@ static __inline__ uint64_t rdtsc(void) {
 
 extern double cpuf;
 
-static inline uint64_t checkTCPU(int timeout, char *file, int line) {
-  static uint64_t __thread lastCPUTime=0;
-  static uint64_t __thread last=0;
-  uint64_t cur=rdtsc();
-  struct timespec CPUt;
-  clock_gettime(CLOCK_THREAD_CPUTIME_ID, &CPUt);
-  uint64_t CPUTime=CPUt.tv_sec*1000*1000+CPUt.tv_nsec/1000;
-  double microCycles=(double)(cpuf*1000);
-  int duration=(int)((cur-last)/microCycles);
-
-  if ( last!=0 && duration > timeout ) {
-    //struct timespec ts;
-    //clock_gettime(CLOCK_MONOTONIC, &ts);
-    printf("%s:%d lte-ue delay %d (exceed %d), CPU for this period: %lld\n", file, line,
-           duration, timeout, (long long)CPUTime-lastCPUTime );
-  }
-
-  last=cur;
-  lastCPUTime=CPUTime;
-  return cur;
+static inline uint64_t checkTCPU(int timeout, char * file, int line) {
+    static uint64_t __thread lastCPUTime=0;
+    static uint64_t __thread last=0;
+    uint64_t cur=rdtsc();
+    struct timespec CPUt;
+    clock_gettime(CLOCK_THREAD_CPUTIME_ID, &CPUt);
+    uint64_t CPUTime=CPUt.tv_sec*1000*1000+CPUt.tv_nsec/1000;
+    double microCycles=(double)(cpuf*1000);
+    int duration=(int)((cur-last)/microCycles);
+    if ( last!=0 && duration > timeout ) {
+      //struct timespec ts;
+      //clock_gettime(CLOCK_MONOTONIC, &ts);
+      printf("%s:%d lte-ue delay %d (exceed %d), CPU for this period: %lld\n", file, line,
+               duration, timeout, (long long)CPUTime-lastCPUTime );
+    }
+    last=cur;
+    lastCPUTime=CPUTime;
+    return cur;
 }
 
-static inline unsigned long long checkT(int timeout, char *file, int line) {
-  static unsigned long long __thread last=0;
-  unsigned long long cur=rdtsc();
-  int microCycles=(int)(cpuf*1000);
-  int duration=(int)((cur-last)/microCycles);
-
-  if ( last!=0 && duration > timeout )
-    printf("%s:%d lte-ue delay %d (exceed %d)\n", file, line,
-           duration, timeout);
-
-  last=cur;
-  return cur;
+static inline unsigned long long checkT(int timeout, char * file, int line) {
+    static unsigned long long __thread last=0;
+    unsigned long long cur=rdtsc();
+    int microCycles=(int)(cpuf*1000);
+    int duration=(int)((cur-last)/microCycles);
+    if ( last!=0 && duration > timeout )
+        printf("%s:%d lte-ue delay %d (exceed %d)\n", file, line,
+               duration, timeout);
+    last=cur;
+    return cur;
 }
 
 typedef struct m {
-  uint64_t iterations;
-  uint64_t sum;
-  uint64_t maxArray[11];
+    uint64_t iterations;
+    uint64_t sum;
+    uint64_t maxArray[11];
 } Meas;
 
-static inline void printMeas(char *txt, Meas *M, int period) {
-  if (M->iterations%period == 0 ) {
-    char txt2[512];
-    sprintf(txt2,"%s avg=%" PRIu64 " iterations=%" PRIu64 " max=%"
-            PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 "\n",
-            txt,
-            M->sum/M->iterations,
-            M->iterations,
-            M->maxArray[1],M->maxArray[2], M->maxArray[3],M->maxArray[4], M->maxArray[5],
-            M->maxArray[6],M->maxArray[7], M->maxArray[8],M->maxArray[9],M->maxArray[10]);
+static inline void printMeas(char * txt, Meas *M, int period) {
+    if (M->iterations%period == 0 ) {
+        char txt2[512];
+        sprintf(txt2,"%s avg=%" PRIu64 " iterations=%" PRIu64 " max=%" 
+                PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 "\n",
+                txt,
+                M->sum/M->iterations,
+                M->iterations,
+                M->maxArray[1],M->maxArray[2], M->maxArray[3],M->maxArray[4], M->maxArray[5], 
+                M->maxArray[6],M->maxArray[7], M->maxArray[8],M->maxArray[9],M->maxArray[10]);
 #if DISABLE_LOG_X
-    printf("%s",txt2);
+        printf("%s",txt2);
 #else
-    LOG_W(PHY, "%s",txt2);
+        LOG_W(PHY, "%s",txt2);
 #endif
-  }
+    }
 }
 
-static inline int cmpint(const void *a, const void *b) {
-  uint64_t *aa=(uint64_t *)a;
-  uint64_t *bb=(uint64_t *)b;
-  return (int)(*aa-*bb);
+static inline int cmpint(const void* a, const void* b) {
+    uint64_t* aa=(uint64_t*)a;
+    uint64_t* bb=(uint64_t*)b;
+    return (int)(*aa-*bb);
 }
 
-static inline void updateTimes(uint64_t start, Meas *M, int period, char *txt) {
-  if (start!=0) {
-    uint64_t end=rdtsc();
-    long long diff=(end-start)/(cpuf*1000);
-    M->maxArray[0]=diff;
-    M->sum+=diff;
-    M->iterations++;
-    qsort(M->maxArray, 11, sizeof(uint64_t), cmpint);
-    printMeas(txt,M,period);
-  }
+static inline void updateTimes(uint64_t start, Meas *M, int period, char * txt) {
+    if (start!=0) {
+        uint64_t end=rdtsc();
+        long long diff=(end-start)/(cpuf*1000);
+        M->maxArray[0]=diff;
+        M->sum+=diff;
+        M->iterations++;
+        qsort(M->maxArray, 11, sizeof(uint64_t), cmpint);
+        printMeas(txt,M,period);
+    }
 }
 
 #define check(a) do { checkT(a,__FILE__,__LINE__); } while (0)

common/utils/T/Makefile

@@ -19,7 +19,7 @@ T_IDs.h: $(GENIDS) T_messages.txt
 	./$(GENIDS) T_messages.txt T_IDs.h
 
 check_vcd:
-	gcc -Wall -I. -I.. -I../itti -I../../../openair2/COMMON -Itracer -o _check_vcd check_vcd.c tracer/database.c tracer/utils.c -lm -pthread
+	gcc -Wall -I. -I.. -I../itti -Itracer -o _check_vcd check_vcd.c tracer/database.c tracer/utils.c -lm -pthread
 	./_check_vcd || (rm -f ./_check_vcd ./T_IDs.h ./T_messages.txt.h && false)
 	rm -f ./_check_vcd
 

common/utils/T/T.c

@@ -12,16 +12,14 @@
 #include "common/config/config_userapi.h"
 
 #define QUIT(x) do { \
-    printf("T tracer: QUIT: %s\n", x); \
-    exit(1); \
-  } while (0)
+  printf("T tracer: QUIT: %s\n", x); \
+  exit(1); \
+} while (0)
 
 /* array used to activate/disactivate a log */
 static int T_IDs[T_NUMBER_OF_IDS];
 int *T_active = T_IDs;
-
-int T_stdout = 1;
-
+int T_stdout;
 
 static int T_socket;
 
@@ -34,159 +32,125 @@ volatile int *T_freelist_head = &_T_freelist_head;
 T_cache_t *T_cache;
 
 #if BASIC_SIMULATOR
-  /* global variables used by T_GET_SLOT, see in T.h */
-  volatile uint64_t T_next_id;
-  volatile uint64_t T_active_id;
+/* global variables used by T_GET_SLOT, see in T.h */
+volatile uint64_t T_next_id;
+volatile uint64_t T_active_id;
 #endif
 
-static void get_message(int s) {
+static void get_message(int s)
+{
   char t;
   int l;
   int id;
   int is_on;
 
   if (read(s, &t, 1) != 1) QUIT("get_message fails");
-
-  printf("T tracer: got mess %d\n", t);
-
+printf("T tracer: got mess %d\n", t);
   switch (t) {
-    case 0:
-
-      /* toggle all those IDs */
-      /* optimze? (too much syscalls) */
-      if (read(s, &l, sizeof(int)) != sizeof(int)) QUIT("get_message fails");
-
-      while (l) {
-        if (read(s, &id, sizeof(int)) != sizeof(int)) QUIT("get_message fails");
-
-        T_IDs[id] = 1 - T_IDs[id];
-        l--;
-      }
-
-      break;
-
-    case 1:
-
-      /* set IDs as given */
-      /* optimize? */
-      if (read(s, &l, sizeof(int)) != sizeof(int)) QUIT("get_message fails");
-
-      id = 0;
-
-      while (l) {
-        if (read(s, &is_on, sizeof(int)) != sizeof(int))
-          QUIT("get_message fails");
-
-        T_IDs[id] = is_on;
-        id++;
-        l--;
-      }
-
-      break;
-
-    case 2:
-      break; /* do nothing, this message is to wait for local tracer */
+  case 0:
+    /* toggle all those IDs */
+    /* optimze? (too much syscalls) */
+    if (read(s, &l, sizeof(int)) != sizeof(int)) QUIT("get_message fails");
+    while (l) {
+      if (read(s, &id, sizeof(int)) != sizeof(int)) QUIT("get_message fails");
+      T_IDs[id] = 1 - T_IDs[id];
+      l--;
+    }
+    break;
+  case 1:
+    /* set IDs as given */
+    /* optimize? */
+    if (read(s, &l, sizeof(int)) != sizeof(int)) QUIT("get_message fails");
+    id = 0;
+    while (l) {
+      if (read(s, &is_on, sizeof(int)) != sizeof(int))
+        QUIT("get_message fails");
+      T_IDs[id] = is_on;
+      id++;
+      l--;
+    }
+    break;
+  case 2: break; /* do nothing, this message is to wait for local tracer */
   }
 }
 
-static void *T_receive_thread(void *_) {
+static void *T_receive_thread(void *_)
+{
   while (1) get_message(T_socket);
-
   return NULL;
 }
 
-static void new_thread(void *(*f)(void *), void *data) {
+static void new_thread(void *(*f)(void *), void *data)
+{
   pthread_t t;
   pthread_attr_t att;
 
-  if (pthread_attr_init(&att)) {
-    fprintf(stderr, "pthread_attr_init err\n");
-    exit(1);
-  }
-
-  if (pthread_attr_setdetachstate(&att, PTHREAD_CREATE_DETACHED)) {
-    fprintf(stderr, "pthread_attr_setdetachstate err\n");
-    exit(1);
-  }
-
-  if (pthread_create(&t, &att, f, data)) {
-    fprintf(stderr, "pthread_create err\n");
-    exit(1);
-  }
-
-  if (pthread_attr_destroy(&att)) {
-    fprintf(stderr, "pthread_attr_destroy err\n");
-    exit(1);
-  }
+  if (pthread_attr_init(&att))
+    { fprintf(stderr, "pthread_attr_init err\n"); exit(1); }
+  if (pthread_attr_setdetachstate(&att, PTHREAD_CREATE_DETACHED))
+    { fprintf(stderr, "pthread_attr_setdetachstate err\n"); exit(1); }
+  if (pthread_create(&t, &att, f, data))
+    { fprintf(stderr, "pthread_create err\n"); exit(1); }
+  if (pthread_attr_destroy(&att))
+    { fprintf(stderr, "pthread_attr_destroy err\n"); exit(1); }
 }
 
 /* defined in local_tracer.c */
 void T_local_tracer_main(int remote_port, int wait_for_tracer,
-                         int local_socket, void *shm_array);
+    int local_socket, void *shm_array);
 
 /* We monitor the tracee and the local tracer processes.
  * When one dies we forcefully kill the other.
  */
 #include <sys/types.h>
 #include <sys/wait.h>
-static void monitor_and_kill(int child1, int child2) {
+static void monitor_and_kill(int child1, int child2)
+{
   int child;
   int status;
+
   child = wait(&status);
-
   if (child == -1) perror("wait");
-
   kill(child1, SIGKILL);
   kill(child2, SIGKILL);
   exit(0);
 }
 
-void T_init(int remote_port, int wait_for_tracer, int dont_fork) {
+void T_init(int remote_port, int wait_for_tracer, int dont_fork)
+{
   int socket_pair[2];
   int s;
   int child1, child2;
   int i;
 
-  if (socketpair(AF_UNIX, SOCK_STREAM, 0, socket_pair)) {
-    perror("socketpair");
-    abort();
-  }
+  if (socketpair(AF_UNIX, SOCK_STREAM, 0, socket_pair))
+    { perror("socketpair"); abort(); }
 
   /* setup shared memory */
   T_cache = mmap(NULL, T_CACHE_SIZE * sizeof(T_cache_t),
                  PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, -1, 0);
-
-  if (T_cache == MAP_FAILED) {
-    perror("mmap");
-    abort();
-  }
+  if (T_cache == MAP_FAILED)
+    { perror("mmap"); abort(); }
 
   /* let's garbage the memory to catch some potential problems
    * (think multiprocessor sync issues, barriers, etc.)
    */
   memset(T_cache, 0x55, T_CACHE_SIZE * sizeof(T_cache_t));
-
   for (i = 0; i < T_CACHE_SIZE; i++) T_cache[i].busy = 0;
 
   /* child1 runs the local tracer and child2 (or main) runs the tracee */
-  child1 = fork();
-
-  if (child1 == -1) abort();
 
+  child1 = fork(); if (child1 == -1) abort();
   if (child1 == 0) {
     close(socket_pair[1]);
     T_local_tracer_main(remote_port, wait_for_tracer, socket_pair[0],
                         T_cache);
     exit(0);
   }
-
   close(socket_pair[0]);
 
   if (dont_fork == 0) {
-    child2 = fork();
-
-    if (child2 == -1) abort();
-
+    child2 = fork(); if (child2 == -1) abort();
     if (child2 != 0) {
       close(socket_pair[1]);
       munmap(T_cache, T_CACHE_SIZE * sizeof(T_cache_t));
@@ -197,21 +161,27 @@ void T_init(int remote_port, int wait_for_tracer, int dont_fork) {
   s = socket_pair[1];
   /* wait for first message - initial list of active T events */
   get_message(s);
+
   T_socket = s;
+
   new_thread(T_receive_thread, NULL);
 }
 
-void T_Config_Init(void) {
-  int T_port=TTRACER_DEFAULT_PORTNUM; /* by default we wait for the tracer */
-  int T_nowait=0;                     /* default port to listen to to wait for the tracer */
-  int T_dont_fork=0;                  /* default is to fork, see 'T_init' to understand */
+void T_Config_Init(void)
+{
+  int T_port;         /* by default we wait for the tracer */
+  int T_nowait;       /* default port to listen to to wait for the tracer */
+  int T_dont_fork;    /* default is to fork, see 'T_init' to understand */
+
   paramdef_t ttraceparams[] = CMDLINE_TTRACEPARAMS_DESC;
+
   /* for a cleaner config file, TTracer params should be defined in a
    * specific section...
    */
   config_get(ttraceparams,
              sizeof(ttraceparams) / sizeof(paramdef_t),
              TTRACER_CONFIG_PREFIX);
+
   /* compatibility: look for TTracer command line options in root section */
   config_process_cmdline(ttraceparams,
                          sizeof(ttraceparams) / sizeof(paramdef_t),

common/utils/T/T.h

@@ -8,7 +8,7 @@
 #include "T_defs.h"
 
 #ifdef T_SEND_TIME
-  #include <time.h>
+#include <time.h>
 #endif
 
 /* T message IDs */
@@ -76,13 +76,13 @@
                              T_BUFFER_MAX - T_LOCAL_size, T_PUT_printf_deref x); \
     if (T_PUT_len < 0) { \
       printf("%s:%d:%s: you can't read this, or can you?", \
-             __FILE__, __LINE__, __FUNCTION__); \
+               __FILE__, __LINE__, __FUNCTION__); \
       abort(); \
     } \
     if (T_PUT_len >= T_BUFFER_MAX - T_LOCAL_size) { \
       printf("%s:%d:%s: cannot put argument %d in T macro, not enough space" \
-             ", consider increasing T_BUFFER_MAX (%d)\n", \
-             __FILE__, __LINE__, __FUNCTION__, argnum, T_BUFFER_MAX); \
+               ", consider increasing T_BUFFER_MAX (%d)\n", \
+               __FILE__, __LINE__, __FUNCTION__, argnum, T_BUFFER_MAX); \
       abort(); \
     } \
     T_LOCAL_size += T_PUT_len + 1; \
@@ -97,9 +97,9 @@ struct T_header;
 /* T macro tricks */
 extern int T_stdout;
 #define TN(...) TN_N(__VA_ARGS__,33,32,31,30,29,28,27,26,25,24,23,22,21,\
-                     20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0)(__VA_ARGS__)
+        20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0)(__VA_ARGS__)
 #define TN_N(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,\
-             n18,n19,n20,n21,n22,n23,n24,n25,n26,n27,n28,n29,n30,n31,n32,n,...) T##n
+        n18,n19,n20,n21,n22,n23,n24,n25,n26,n27,n28,n29,n30,n31,n32,n,...) T##n
 #define T(...) do { if (T_stdout == 0) TN(__VA_ARGS__); } while (0)
 
 /* type used to send arbitrary buffer data */
@@ -119,30 +119,30 @@ extern int *T_active;
  */
 #if BASIC_SIMULATOR
 #  define T_GET_SLOT \
-  do { \
-    extern volatile uint64_t T_next_id; \
-    extern volatile uint64_t T_active_id; \
-    uint64_t id; \
-    /* get a ticket */ \
-    id = __sync_fetch_and_add(&T_next_id, 1); \
-    /* wait for our turn */ \
-    while (id != __sync_fetch_and_add(&T_active_id, 0)) /* busy wait */; \
-    /* this is our turn, try to acquire the slot until it's free */ \
-    do { \
-      T_LOCAL_busy = __sync_fetch_and_or(&T_cache[T_LOCAL_slot].busy, 0x01); \
-      if (T_LOCAL_busy & 0x01) usleep(100); \
-    } while (T_LOCAL_busy & 0x01); \
-    /* check that there are still some tickets */ \
-    if (__sync_fetch_and_add(&T_active_id, 0) == 0xffffffffffffffff) { \
-      printf("T: reached the end of times, bye...\n"); \
-      abort(); \
-    } \
-    /* free our ticket, which signals the next waiter that it's its turn */ \
-    (void)__sync_fetch_and_add(&T_active_id, 1); \
-  } while (0)
+     do { \
+       extern volatile uint64_t T_next_id; \
+       extern volatile uint64_t T_active_id; \
+       uint64_t id; \
+       /* get a ticket */ \
+       id = __sync_fetch_and_add(&T_next_id, 1); \
+       /* wait for our turn */ \
+       while (id != __sync_fetch_and_add(&T_active_id, 0)) /* busy wait */; \
+       /* this is our turn, try to acquire the slot until it's free */ \
+       do { \
+         T_LOCAL_busy = __sync_fetch_and_or(&T_cache[T_LOCAL_slot].busy, 0x01); \
+         if (T_LOCAL_busy & 0x01) usleep(100); \
+       } while (T_LOCAL_busy & 0x01); \
+       /* check that there are still some tickets */ \
+       if (__sync_fetch_and_add(&T_active_id, 0) == 0xffffffffffffffff) { \
+         printf("T: reached the end of times, bye...\n"); \
+         abort(); \
+       } \
+       /* free our ticket, which signals the next waiter that it's its turn */ \
+       (void)__sync_fetch_and_add(&T_active_id, 1); \
+     } while (0)
 #else
 #  define T_GET_SLOT \
-  T_LOCAL_busy = __sync_fetch_and_or(&T_cache[T_LOCAL_slot].busy, 0x01);
+     T_LOCAL_busy = __sync_fetch_and_or(&T_cache[T_LOCAL_slot].busy, 0x01);
 #endif
 
 /* used at header of Tn, allocates buffer */
@@ -172,8 +172,8 @@ extern int *T_active;
 #define T_CHECK_SIZE(len, argnum) \
   if (T_LOCAL_size + (len) > T_BUFFER_MAX) { \
     printf("%s:%d:%s: cannot put argument %d in T macro, not enough space" \
-           ", consider increasing T_BUFFER_MAX (%d)\n", \
-           __FILE__, __LINE__, __FUNCTION__, argnum, T_BUFFER_MAX); \
+             ", consider increasing T_BUFFER_MAX (%d)\n", \
+             __FILE__, __LINE__, __FUNCTION__, argnum, T_BUFFER_MAX); \
     abort(); \
   }
 
@@ -598,21 +598,20 @@ extern int *T_active;
 
 
 #define TTRACER_CONFIG_PREFIX   "TTracer"
-/*-------------------------------------------------------------------------------------------------------------------------------------------------*/
-/*                                            configuration parameters for TTRACE utility                                                          */
-/*   optname                     helpstr                paramflags           XXXptr           defXXXval                         type       numelt  */
-/*-------------------------------------------------------------------------------------------------------------------------------------------------*/
-#define TTRACER_DEFAULT_PORTNUM 2021
+/*------------------------------------------------------------------------------------------------------------------------------------------*/
+/*                                            configuration parameters for TTRACE utility                                                   */
+/*   optname                     helpstr                paramflags           XXXptr           defXXXval         type       numelt           */
+/*------------------------------------------------------------------------------------------------------------------------------------------*/
 #define CMDLINE_TTRACEPARAMS_DESC {  \
-    {"T_port",                     CONFIG_HLP_TPORT,      0,                iptr:&T_port,        defintval:TTRACER_DEFAULT_PORTNUM, TYPE_INT,   0},\
-    {"T_nowait",                   CONFIG_HLP_NOTWAIT,    PARAMFLAG_BOOL,   iptr:&T_nowait,      defintval:0,                       TYPE_INT,   0},\
-    {"T_dont_fork",                CONFIG_HLP_TNOFORK,    PARAMFLAG_BOOL,   iptr:&T_dont_fork,   defintval:0,                       TYPE_INT,   0},\
-    {"T_stdout",                   CONFIG_HLP_STDOUT,     PARAMFLAG_BOOL,   iptr:&T_stdout,      defintval:1,                       TYPE_INT,   0},\
-  }
+{"T_port",                     CONFIG_HLP_TPORT,      0,                iptr:&T_port,        defintval:2021,     TYPE_INT,   0},           \
+{"T_nowait",                   CONFIG_HLP_NOTWAIT,    PARAMFLAG_BOOL,   iptr:&T_nowait,      defintval:0,        TYPE_INT,   0},           \
+{"T_dont_fork",                CONFIG_HLP_TNOFORK,    PARAMFLAG_BOOL,   iptr:&T_dont_fork,   defintval:0,        TYPE_INT,   0},           \
+{"T_stdout",                   CONFIG_HLP_STDOUT,     PARAMFLAG_BOOL,   iptr:&T_stdout,      defintval:1,        TYPE_INT,   0},           \
+} 
 
 
 
-/* log on stdout */
+        /* log on stdout */
 void T_init(int remote_port, int wait_for_tracer, int dont_fork);
 void T_Config_Init(void);
 #else /* T_TRACER */

common/utils/T/genids.c

@@ -8,35 +8,27 @@ char **unique_ids;
 int unique_ids_size;
 int unique_ids_maxsize;
 
-int cmp(const void *p1, const void *p2) {
-  return strcmp(*(char *const *)p1, *(char *const *)p2);
+int cmp(const void *p1, const void *p2)
+{
+  return strcmp(*(char * const *)p1, *(char * const *)p2);
 }
 
 /* return 1 if s was not already known, 0 if it was */
-int new_unique_id(char *s, char *input_file) {
+int new_unique_id(char *s, char *input_file)
+{
   if (unique_ids_size)
-    if (bsearch(&s, unique_ids, unique_ids_size, sizeof(char *), cmp) != NULL) {
-      printf("error: ID %s is not unique in %s\n", s, input_file);
-      return 0;
-    }
-
+  if (bsearch(&s, unique_ids, unique_ids_size, sizeof(char *), cmp) != NULL) {
+    printf("error: ID %s is not unique in %s\n", s, input_file);
+    return 0;
+  }
   if (unique_ids_size == unique_ids_maxsize) {
     unique_ids_maxsize += 256;
     unique_ids = realloc(unique_ids, unique_ids_maxsize * sizeof(char *));
-
-    if (unique_ids == NULL) {
-      printf("error: out of memory\n");
-      abort();
-    }
+    if (unique_ids == NULL) { printf("erorr: out of memory\n"); abort(); }
   }
-
   unique_ids[unique_ids_size] = strdup(s);
-
-  if (unique_ids[unique_ids_size] == NULL) {
-    printf("error: out of memory\n");
-    abort();
-  }
-
+  if (unique_ids[unique_ids_size] == NULL)
+    { printf("erorr: out of memory\n"); abort(); }
   unique_ids_size++;
   qsort(unique_ids, unique_ids_size, sizeof(char *), cmp);
   return 1;
@@ -46,17 +38,14 @@ char *bufname;
 int bufname_size;
 int bufname_maxsize;
 
-void putname(int c) {
+void putname(int c)
+{
   if (bufname_size == bufname_maxsize) {
     bufname_maxsize += 256;
     bufname = realloc(bufname, bufname_maxsize);
-
-    if (bufname == NULL) {
-      printf("error: memory allocation error\n");
-      exit(1);
-    }
+    if (bufname == NULL)
+      { printf("erorr: memory allocation error\n"); exit(1); }
   }
-
   bufname[bufname_size] = c;
   bufname_size++;
 }
@@ -65,54 +54,42 @@ char *bufvalue;
 int bufvalue_size;
 int bufvalue_maxsize;
 
-void putvalue(int c) {
+void putvalue(int c)
+{
   if (bufvalue_size == bufvalue_maxsize) {
     bufvalue_maxsize += 256;
     bufvalue = realloc(bufvalue, bufvalue_maxsize);
-
-    if (bufvalue == NULL) {
-      printf("error: memory allocation error\n");
-      exit(1);
-    }
+    if (bufvalue == NULL)
+      { printf("error: memory allocation error\n"); exit(1); }
   }
-
   bufvalue[bufvalue_size] = c;
   bufvalue_size++;
 }
 
-void smash_spaces(FILE *f) {
+void smash_spaces(FILE *f)
+{
   int c;
-
   while (1) {
     c = fgetc(f);
-
     if (isspace(c)) continue;
-
     if (c == ' ') continue;
-
     if (c == '\t') continue;
-
     if (c == '\n') continue;
-
     if (c == 10 || c == 13) continue;
-
     if (c == '#') {
       while (1) {
         c = fgetc(f);
-
         if (c == '\n' || c == EOF) break;
       }
-
       continue;
     }
-
     break;
   }
-
   if (c != EOF) ungetc(c, f);
 }
 
-void get_line(FILE *f, char **name, char **value) {
+void get_line(FILE *f, char **name, char **value)
+{
   int c;
   bufname_size = 0;
   bufvalue_size = 0;
@@ -120,39 +97,23 @@ void get_line(FILE *f, char **name, char **value) {
   *value = NULL;
   smash_spaces(f);
   c = fgetc(f);
-
-  while (!(c == '=' || isspace(c) || c == EOF)) {
-    putname(c);
-    c = fgetc(f);
-  }
-
+  while (!(c == '=' || isspace(c) || c == EOF)) { putname(c); c = fgetc(f); }
   if (c == EOF) return;
-
   putname(0);
-
   while (!(c == EOF || c == '=')) c = fgetc(f);
-
   if (c == EOF) return;
-
   smash_spaces(f);
   c = fgetc(f);
-
-  while (!(c == 10 || c == 13 || c == EOF)) {
-    putvalue(c);
-    c = fgetc(f);
-  }
-
+  while (!(c == 10 || c == 13 || c == EOF)) { putvalue(c); c = fgetc(f); }
   putvalue(0);
-
   if (bufname_size <= 1) return;
-
   if (bufvalue_size <= 1) return;
-
   *name = bufname;
   *value = bufvalue;
 }
 
-int main(int n, char **v) {
+int main(int n, char **v)
+{
   FILE *in;
   FILE *out;
   char *name;
@@ -160,54 +121,36 @@ int main(int n, char **v) {
   char *in_name;
   char *out_name;
 
-  if (n != 3) {
-    printf("error: gimme <source> <dest>\n");
-    exit(1);
-  }
+  if (n != 3) { printf("error: gimme <source> <dest>\n"); exit(1); }
 
   n = 0;
+
   in_name = v[1];
   out_name = v[2];
-  in = fopen(in_name, "r");
 
-  if (in == NULL) {
-    perror(in_name);
-    exit(1);
-  }
-
-  out = fopen(out_name, "w");
-
-  if (out == NULL) {
-    perror(out_name);
-    exit(1);
-  }
+  in = fopen(in_name, "r"); if (in == NULL) { perror(in_name); exit(1); }
+  out = fopen(out_name, "w"); if (out == NULL) { perror(out_name); exit(1); }
 
   fprintf(out, "/* generated file, do not edit by hand */\n\n");
 
   while (1) {
     get_line(in, &name, &value);
-
     if (name == NULL) break;
-
     if (isspace(value[strlen(value)-1])) {
       printf("error: bad value '%s' (no space at the end please!)\n", value);
       unlink(out_name);
       exit(1);
     }
-
     if (!strcmp(name, "ID")) {
-      if (!new_unique_id(value, in_name)) {
-        unlink(out_name);
-        exit(1);
-      }
-
+      if (!new_unique_id(value, in_name)) { unlink(out_name); exit(1); }
       fprintf(out, "#define T_%s T_ID(%d)\n", value, n);
       n++;
     }
   }
-
   fprintf(out, "#define T_NUMBER_OF_IDS %d\n", n);
+
   fclose(in);
   fclose(out);
+
   return 0;
 }

common/utils/T/tracer/gui/x.c

@@ -7,19 +7,21 @@
 #include <stdlib.h>
 #include <string.h>
 
-int x_connection_fd(x_connection *_x) {
+int x_connection_fd(x_connection *_x)
+{
   struct x_connection *x = _x;
   return ConnectionNumber(x->d);
 }
 
-static GC create_gc(Display *d, char *color) {
+static GC create_gc(Display *d, char *color)
+{
   GC ret = XCreateGC(d, DefaultRootWindow(d), 0, NULL);
   XGCValues gcv;
   XColor rcol, scol;
-  XCopyGC(d, DefaultGC(d, DefaultScreen(d)), -1L, ret);
 
+  XCopyGC(d, DefaultGC(d, DefaultScreen(d)), -1L, ret);
   if (XAllocNamedColor(d, DefaultColormap(d, DefaultScreen(d)),
-                       color, &scol, &rcol)) {
+                      color, &scol, &rcol)) {
     gcv.foreground = scol.pixel;
     XChangeGC(d, ret, GCForeground, &gcv);
   } else ERR("X: could not allocate color '%s'\n", color);
@@ -27,81 +29,82 @@ static GC create_gc(Display *d, char *color) {
   return ret;
 }
 
-int x_new_color(x_connection *_x, char *color) {
+int x_new_color(x_connection *_x, char *color)
+{
   struct x_connection *x = _x;
   x->ncolors++;
+
   x->colors = realloc(x->colors, x->ncolors * sizeof(GC));
-
   if (x->colors == NULL) OOM;
-
   x->colors[x->ncolors-1] = create_gc(x->d, color);
+
   x->xft_colors = realloc(x->xft_colors, x->ncolors * sizeof(XftColor));
-
   if (x->xft_colors == NULL) OOM;
-
   if (XftColorAllocName(x->d, DefaultVisual(x->d, DefaultScreen(x->d)),
-                        DefaultColormap(x->d, DefaultScreen(x->d)),
-                        color, &x->xft_colors[x->ncolors-1]) == False)
+      DefaultColormap(x->d, DefaultScreen(x->d)),
+      color, &x->xft_colors[x->ncolors-1]) == False)
     ERR("could not allocate color '%s'\n", color);
 
   return x->ncolors - 1;
 }
 
-int x_new_font(x_connection *_x, char *font) {
+int x_new_font(x_connection *_x, char *font)
+{
   struct x_connection *x = _x;
   /* TODO: allocate fonts only once */
   x->nfonts++;
   x->fonts = realloc(x->fonts, x->nfonts * sizeof(XftFont *));
-
   if (x->fonts == NULL) OOM;
-
   x->fonts[x->nfonts-1] = XftFontOpenName(x->d, DefaultScreen(x->d), font);
-
   if (x->fonts[x->nfonts-1] == NULL)
     ERR("failed allocating font '%s'\n", font);
-
   return x->nfonts - 1;
 }
 
-x_connection *x_open(void) {
+x_connection *x_open(void)
+{
   struct x_connection *ret;
-  ret = calloc(1, sizeof(struct x_connection));
 
+  ret = calloc(1, sizeof(struct x_connection));
   if (ret == NULL) OOM;
 
   ret->d = XOpenDisplay(0);
   LOGD("XOpenDisplay display %p return x_connection %p\n", ret->d, ret);
-
   if (ret->d == NULL) ERR("error calling XOpenDisplay: no X? you root?\n");
 
   x_new_color(ret, "white");    /* background color */
   x_new_color(ret, "black");    /* foreground color */
+
   x_new_font(ret, "sans-8");
+
   return ret;
 }
 
 x_window *x_create_window(x_connection *_x, int width, int height,
-                          char *title) {
+    char *title)
+{
   struct x_connection *x = _x;
   struct x_window *ret;
-  ret = calloc(1, sizeof(struct x_window));
 
+  ret = calloc(1, sizeof(struct x_window));
   if (ret == NULL) OOM;
 
   ret->w = XCreateSimpleWindow(x->d, DefaultRootWindow(x->d), 0, 0,
-                               width, height, 0, WhitePixel(x->d, DefaultScreen(x->d)),
-                               WhitePixel(x->d, DefaultScreen(x->d)));
+      width, height, 0, WhitePixel(x->d, DefaultScreen(x->d)),
+      WhitePixel(x->d, DefaultScreen(x->d)));
   ret->width = width;
   ret->height = height;
-  XStoreName(x->d, ret->w, title);
-  ret->p = XCreatePixmap(x->d, ret->w, width, height,
-                         DefaultDepth(x->d, DefaultScreen(x->d)));
-  XFillRectangle(x->d, ret->p, x->colors[BACKGROUND_COLOR],
-                 0, 0, width, height);
-  ret->xft = XftDrawCreate(x->d, ret->p,
-                           DefaultVisual(x->d, DefaultScreen(x->d)),
-                           DefaultColormap(x->d, DefaultScreen(x->d)));
 
+  XStoreName(x->d, ret->w, title);
+
+  ret->p = XCreatePixmap(x->d, ret->w, width, height,
+      DefaultDepth(x->d, DefaultScreen(x->d)));
+  XFillRectangle(x->d, ret->p, x->colors[BACKGROUND_COLOR],
+      0, 0, width, height);
+
+  ret->xft = XftDrawCreate(x->d, ret->p,
+      DefaultVisual(x->d, DefaultScreen(x->d)),
+      DefaultColormap(x->d, DefaultScreen(x->d)));
   if (ret->xft == NULL) ERR("XftDrawCreate failed\n");
 
   /* enable backing store */
@@ -110,19 +113,23 @@ x_window *x_create_window(x_connection *_x, int width, int height,
     att.backing_store = Always;
     XChangeWindowAttributes(x->d, ret->w, CWBackingStore, &att);
   }
+
   XSelectInput(x->d, ret->w,
-               KeyPressMask      |
-               ButtonPressMask   |
-               ButtonReleaseMask |
-               PointerMotionMask |
-               ExposureMask      |
-               StructureNotifyMask);
+      KeyPressMask      |
+      ButtonPressMask   |
+      ButtonReleaseMask |
+      PointerMotionMask |
+      ExposureMask      |
+      StructureNotifyMask);
+
   XMapWindow(x->d, ret->w);
+
   return ret;
 }
 
 x_image *x_create_image(x_connection *_x, unsigned char *data,
-                        int width, int height) {
+    int width, int height)
+{
   struct x_connection *x = _x;
   struct x_image *ret;
   XImage *ximage;
@@ -130,9 +137,8 @@ x_image *x_create_image(x_connection *_x, unsigned char *data,
   XVisualInfo template;
   int nvs;
   Visual *v;
-  ret = calloc(1, sizeof(struct x_image));
 
-  if (ret == NULL) OOM;
+  ret = calloc(1, sizeof(struct x_image)); if (ret == NULL) OOM;
 
   template.class = TrueColor;
   template.depth = 24;
@@ -140,65 +146,68 @@ x_image *x_create_image(x_connection *_x, unsigned char *data,
   template.green_mask = 0x00ff00;
   template.blue_mask = 0x0000ff;
   template.bits_per_rgb = 8;
+
   vs = XGetVisualInfo(x->d, VisualDepthMask | VisualClassMask |
-                      VisualRedMaskMask | VisualGreenMaskMask | VisualBlueMaskMask |
-                      VisualBitsPerRGBMask, &template, &nvs);
+      VisualRedMaskMask | VisualGreenMaskMask | VisualBlueMaskMask |
+      VisualBitsPerRGBMask, &template, &nvs);
 
   if (vs == NULL) {
     /* try again with 32 bpp */
     template.depth = 32;
     vs = XGetVisualInfo(x->d, VisualDepthMask | VisualClassMask |
-                        VisualRedMaskMask | VisualGreenMaskMask | VisualBlueMaskMask |
-                        VisualBitsPerRGBMask, &template, &nvs);
+        VisualRedMaskMask | VisualGreenMaskMask | VisualBlueMaskMask |
+        VisualBitsPerRGBMask, &template, &nvs);
   }
 
   if (vs == NULL) ERR("no good visual found\n");
 
   v = vs[0].visual;
   XFree(vs);
-  ximage = XCreateImage(x->d, v, 24, ZPixmap, 0,
-                        (char *)data, width, height, 32, 0);
 
+  ximage = XCreateImage(x->d, v, 24, ZPixmap, 0,
+      (char*)data, width, height, 32, 0);
   if (ximage == NULL) ERR("image creation failed\n");
 
   ret->p = XCreatePixmap(x->d, DefaultRootWindow(x->d), width, height, 24);
+
   XPutImage(x->d, ret->p, DefaultGC(x->d, DefaultScreen(x->d)),
-            ximage, 0, 0, 0, 0, width, height);
+      ximage, 0, 0, 0, 0, width, height);
+
   /* TODO: be sure it's fine to set data to NULL */
   ximage->data = NULL;
   XDestroyImage(ximage);
+
   ret->width = width;
   ret->height = height;
+
   return ret;
 }
 
-static struct toplevel_window_widget *find_x_window(struct gui *g, Window id) {
+static struct toplevel_window_widget *find_x_window(struct gui *g, Window id)
+{
   struct widget_list *cur;
   struct toplevel_window_widget *w;
   struct x_window *xw;
   cur = g->toplevel;
-
   while (cur) {
     w = (struct toplevel_window_widget *)cur->item;
     xw = w->x;
-
     if (xw->w == id) return w;
-
     cur = cur->next;
   }
-
   return NULL;
 }
 
-void x_events(gui *_gui) {
+void x_events(gui *_gui)
+{
   struct gui *g = _gui;
   struct widget_list *cur;
   struct x_connection *x = g->x;
   struct toplevel_window_widget *w;
+
   LOGD("x_events START\n");
   /* preprocessing (to "compress" events) */
   cur = g->toplevel;
-
   while (cur) {
     struct x_window *xw;
     w = (struct toplevel_window_widget *)cur->item;
@@ -213,84 +222,58 @@ void x_events(gui *_gui) {
     XEvent ev;
     XNextEvent(x->d, &ev);
     LOGD("XEV %d\n", ev.type);
-
     switch (ev.type) {
-      case MapNotify:
-      case Expose:
-        if ((w = find_x_window(g, ev.xexpose.window)) != NULL) {
-          struct x_window *xw = w->x;
-          xw->redraw = 1;
-        }
-
-        break;
-
-      case ConfigureNotify:
-        if ((w = find_x_window(g, ev.xconfigure.window)) != NULL) {
-          struct x_window *xw = w->x;
-          xw->resize = 1;
-          xw->new_width = ev.xconfigure.width;
-          xw->new_height = ev.xconfigure.height;
-
-          if (xw->new_width < 10) xw->new_width = 10;
-
-          if (xw->new_height < 10) xw->new_height = 10;
-
-          LOGD("ConfigureNotify %d %d\n", ev.xconfigure.width, ev.xconfigure.height);
-        }
-
-        break;
-
-      case ButtonPress:
-        if ((w = find_x_window(g, ev.xbutton.window)) != NULL) {
-          int key_modifiers = 0;
-
-          if (ev.xbutton.state & ShiftMask)   key_modifiers |= KEY_SHIFT;
-
-          if (ev.xbutton.state & Mod1Mask)    key_modifiers |= KEY_ALT;
-
-          if (ev.xbutton.state & ControlMask) key_modifiers |= KEY_CONTROL;
-
-          w->common.button(g, w, ev.xbutton.x, ev.xbutton.y, key_modifiers,
-                           ev.xbutton.button, 0);
-        }
-
-        break;
-
-      case ButtonRelease:
-        if ((w = find_x_window(g, ev.xbutton.window)) != NULL) {
-          int key_modifiers = 0;
-
-          if (ev.xbutton.state & ShiftMask)   key_modifiers |= KEY_SHIFT;
-
-          if (ev.xbutton.state & Mod1Mask)    key_modifiers |= KEY_ALT;
-
-          if (ev.xbutton.state & ControlMask) key_modifiers |= KEY_CONTROL;
-
-          w->common.button(g, w, ev.xbutton.x, ev.xbutton.y, key_modifiers,
-                           ev.xbutton.button, 1);
-        }
-
-        break;
-
-      default:
-        if (gui_logd) WARN("TODO: X event type %d\n", ev.type);
-
-        break;
+    case MapNotify:
+    case Expose:
+      if ((w = find_x_window(g, ev.xexpose.window)) != NULL) {
+        struct x_window *xw = w->x;
+        xw->redraw = 1;
+      }
+      break;
+    case ConfigureNotify:
+      if ((w = find_x_window(g, ev.xconfigure.window)) != NULL) {
+        struct x_window *xw = w->x;
+        xw->resize = 1;
+        xw->new_width = ev.xconfigure.width;
+        xw->new_height = ev.xconfigure.height;
+        if (xw->new_width < 10) xw->new_width = 10;
+        if (xw->new_height < 10) xw->new_height = 10;
+        LOGD("ConfigureNotify %d %d\n", ev.xconfigure.width, ev.xconfigure.height);
+      }
+      break;
+    case ButtonPress:
+      if ((w = find_x_window(g, ev.xbutton.window)) != NULL) {
+        int key_modifiers = 0;
+        if (ev.xbutton.state & ShiftMask)   key_modifiers |= KEY_SHIFT;
+        if (ev.xbutton.state & Mod1Mask)    key_modifiers |= KEY_ALT;
+        if (ev.xbutton.state & ControlMask) key_modifiers |= KEY_CONTROL;
+        w->common.button(g, w, ev.xbutton.x, ev.xbutton.y, key_modifiers,
+            ev.xbutton.button, 0);
+      }
+      break;
+    case ButtonRelease:
+      if ((w = find_x_window(g, ev.xbutton.window)) != NULL) {
+        int key_modifiers = 0;
+        if (ev.xbutton.state & ShiftMask)   key_modifiers |= KEY_SHIFT;
+        if (ev.xbutton.state & Mod1Mask)    key_modifiers |= KEY_ALT;
+        if (ev.xbutton.state & ControlMask) key_modifiers |= KEY_CONTROL;
+        w->common.button(g, w, ev.xbutton.x, ev.xbutton.y, key_modifiers,
+            ev.xbutton.button, 1);
+      }
+      break;
+    default: if (gui_logd) WARN("TODO: X event type %d\n", ev.type); break;
     }
   }
 
   /* postprocessing */
   LOGD("post processing\n");
   cur = g->toplevel;
-
   while (cur) {
     struct toplevel_window_widget *w =
-      (struct toplevel_window_widget *)cur->item;
+        (struct toplevel_window_widget *)cur->item;
     struct x_window *xw = w->x;
-
     if (xw->resize) {
       LOGD("resize old %d %d new %d %d\n", xw->width, xw->height, xw->new_width, xw->new_height);
-
       if (xw->width != xw->new_width || xw->height != xw->new_height) {
         w->common.allocate(g, w, 0, 0, xw->new_width, xw->new_height);
         xw->width = xw->new_width;
@@ -298,47 +281,46 @@ void x_events(gui *_gui) {
         XftDrawDestroy(xw->xft);
         XFreePixmap(x->d, xw->p);
         xw->p = XCreatePixmap(x->d, xw->w, xw->width, xw->height,
-                              DefaultDepth(x->d, DefaultScreen(x->d)));
+            DefaultDepth(x->d, DefaultScreen(x->d)));
         XFillRectangle(x->d, xw->p, x->colors[BACKGROUND_COLOR],
-                       0, 0, xw->width, xw->height);
+            0, 0, xw->width, xw->height);
         xw->xft = XftDrawCreate(x->d, xw->p,
-                                DefaultVisual(x->d, DefaultScreen(x->d)),
-                                DefaultColormap(x->d, DefaultScreen(x->d)));
-
+            DefaultVisual(x->d, DefaultScreen(x->d)),
+            DefaultColormap(x->d, DefaultScreen(x->d)));
         if (xw->xft == NULL) ERR("XftDrawCreate failed\n");
 
         //xw->repaint = 1;
       }
     }
-
     if (xw->repaint) {
       w->common.paint(g, w);
       xw->redraw = 1;
     }
-
     if (xw->redraw) {
       struct x_connection *x = g->x;
       LOGD("XCopyArea w h %d %d\n", xw->width, xw->height);
       XCopyArea(x->d, xw->p, xw->w, x->colors[1],
-                0, 0, xw->width, xw->height, 0, 0);
+          0, 0, xw->width, xw->height, 0, 0);
     }
-
     cur = cur->next;
   }
-
   LOGD("x_events DONE\n");
 }
 
-void x_flush(x_connection *_x) {
+void x_flush(x_connection *_x)
+{
   struct x_connection *x = _x;
   XFlush(x->d);
 }
 
 void x_text_get_dimensions(x_connection *_c, int font, const char *t,
-                           int *width, int *height, int *baseline) {
+    int *width, int *height, int *baseline)
+{
   struct x_connection *c = _c;
   XGlyphInfo ext;
+
   XftTextExtentsUtf8(c->d, c->fonts[font], (FcChar8 *)t, strlen(t), &ext);
+
   *width = ext.width;
   *height = c->fonts[font]->height;
   *baseline = c->fonts[font]->ascent;
@@ -349,57 +331,63 @@ void x_text_get_dimensions(x_connection *_c, int font, const char *t,
 /***********************************************************************/
 
 void x_draw_line(x_connection *_c, x_window *_w, int color,
-                 int x1, int y1, int x2, int y2) {
+    int x1, int y1, int x2, int y2)
+{
   struct x_connection *c = _c;
   struct x_window *w = _w;
   XDrawLine(c->d, w->p, c->colors[color], x1, y1, x2, y2);
 }
 
 void x_draw_rectangle(x_connection *_c, x_window *_w, int color,
-                      int x, int y, int width, int height) {
+    int x, int y, int width, int height)
+{
   struct x_connection *c = _c;
   struct x_window *w = _w;
   XDrawRectangle(c->d, w->p, c->colors[color], x, y, width, height);
 }
 
 void x_fill_rectangle(x_connection *_c, x_window *_w, int color,
-                      int x, int y, int width, int height) {
+    int x, int y, int width, int height)
+{
   struct x_connection *c = _c;
   struct x_window *w = _w;
   XFillRectangle(c->d, w->p, c->colors[color], x, y, width, height);
 }
 
 void x_draw_string(x_connection *_c, x_window *_w, int font, int color,
-                   int x, int y, const char *t) {
+    int x, int y, const char *t)
+{
   struct x_connection *c = _c;
   struct x_window *w = _w;
   int tlen = strlen(t);
   XftDrawStringUtf8(w->xft, &c->xft_colors[color], c->fonts[font],
-                    x, y, (const unsigned char *)t, tlen);
+      x, y, (const unsigned char *)t, tlen);
 }
 
 void x_draw_clipped_string(x_connection *_c, x_window *_w, int font,
-                           int color, int x, int y, const char *t,
-                           int clipx, int clipy, int clipwidth, int clipheight) {
+    int color, int x, int y, const char *t,
+    int clipx, int clipy, int clipwidth, int clipheight)
+{
   struct x_window *w = _w;
+
   XRectangle clip = { clipx, clipy, clipwidth, clipheight };
-
   if (XftDrawSetClipRectangles(w->xft, 0, 0, &clip, 1) == False) abort();
-
   x_draw_string(_c, _w, font, color, x, y, t);
-
   if (XftDrawSetClip(w->xft, NULL) == False) abort();
 }
 
-void x_draw_image(x_connection *_c, x_window *_w, x_image *_img, int x, int y) {
+void x_draw_image(x_connection *_c, x_window *_w, x_image *_img, int x, int y)
+{
   struct x_connection *c = _c;
   struct x_window *w = _w;
   struct x_image *img = _img;
+
   XCopyArea(c->d, img->p, w->p, DefaultGC(c->d, DefaultScreen(c->d)),
-            0, 0, img->width, img->height, x, y);
+      0, 0, img->width, img->height, x, y);
 }
 
-void x_draw(x_connection *_c, x_window *_w) {
+void x_draw(x_connection *_c, x_window *_w)
+{
   struct x_connection *c = _c;
   struct x_window *w = _w;
   LOGD("x_draw XCopyArea w h %d %d display %p window %d pixmap %d\n", w->width, w->height, c->d, (int)w->w, (int)w->p);
@@ -409,13 +397,13 @@ void x_draw(x_connection *_c, x_window *_w) {
 /* those two special functions are to plot many points
  * first call x_add_point many times then x_plot_points once
  */
-void x_add_point(x_connection *_c, int x, int y) {
+void x_add_point(x_connection *_c, int x, int y)
+{
   struct x_connection *c = _c;
 
   if (c->pts_size == c->pts_maxsize) {
     c->pts_maxsize += 65536;
     c->pts = realloc(c->pts, c->pts_maxsize * sizeof(XPoint));
-
     if (c->pts == NULL) OOM;
   }
 
@@ -424,11 +412,12 @@ void x_add_point(x_connection *_c, int x, int y) {
   c->pts_size++;
 }
 
-void x_plot_points(x_connection *_c, x_window *_w, int color) {
+void x_plot_points(x_connection *_c, x_window *_w, int color)
+{
   struct x_connection *c = _c;
   LOGD("x_plot_points %d points\n", c->pts_size);
   struct x_window *w = _w;
   XDrawPoints(c->d, w->p, c->colors[color], c->pts, c->pts_size,
-              CoordModeOrigin);
+      CoordModeOrigin);
   c->pts_size = 0;
 }

common/utils/assertions.h

@@ -22,7 +22,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>
+#ifdef CMAKER
 #include <platform_types.h>
+#endif
 
 #if defined(ENB_MODE)
 # define display_backtrace()

common/utils/msc/msc.c

@@ -49,7 +49,7 @@
 
 //-------------------------------
 
-FILE    *g_msc_fd;
+FILE*    g_msc_fd;
 char     g_msc_proto2str[MAX_MSC_PROTOS][MSC_MAX_PROTO_NAME_LENGTH];
 
 
@@ -70,11 +70,15 @@ void *msc_task(void *args_p)
 //------------------------------------------------------------------------------
 {
   MessageDef         *received_message_p    = NULL;
-  //  const char         *msg_name = NULL;
-  //  instance_t          instance  = 0;
+//  const char         *msg_name = NULL;
+//  instance_t          instance  = 0;
   long                timer_id;
+
   itti_mark_task_ready(TASK_MSC);
+
   msc_start_use();
+
+
   timer_setup(0, // seconds
               50000, // usec
               TASK_MSC,
@@ -87,18 +91,20 @@ void *msc_task(void *args_p)
     itti_receive_msg(TASK_MSC, &received_message_p);
 
     if (received_message_p != NULL) {
-      //      msg_name = ITTI_MSG_NAME (received_message_p);
-      //      instance = ITTI_MSG_INSTANCE (received_message_p);
+//      msg_name = ITTI_MSG_NAME (received_message_p);
+//      instance = ITTI_MSG_INSTANCE (received_message_p);
+      
       switch (ITTI_MSG_ID(received_message_p)) {
+
         case TIMER_HAS_EXPIRED: {
-          msc_flush_messages();
+    	  msc_flush_messages();
         }
         break;
 
         case TERMINATE_MESSAGE: {
           fprintf(stderr, " *** Exiting MSC thread\n");
           timer_remove(timer_id);
-          msc_end();
+    	  msc_end();
           itti_exit_task();
         }
         break;
@@ -113,7 +119,6 @@ void *msc_task(void *args_p)
       }
     }
   }
-
   fprintf(stderr, "Task MSC exiting\n");
   return NULL;
 }
@@ -127,16 +132,15 @@ int msc_init(const msc_env_t envP, const int max_threadsP)
   void *pointer_p;
   char  msc_filename[256];
   fprintf(stderr, "Initializing MSC logs\n");
-  rv = snprintf(msc_filename, 256, "/tmp/openair.msc.%i.log", envP); // TODO NAME
 
-  if ((0 >= rv) || (256 < rv)) {
+  rv = snprintf(msc_filename, 256, "/tmp/openair.msc.%u.log", envP); // TODO NAME
+  if ((0 >= rv) || (256 < rv)){
     fprintf(stderr, "Error in MSC log file name");
   }
-
   g_msc_fd = fopen(msc_filename,"w");
   AssertFatal(g_msc_fd != NULL, "Could not open MSC log file %s : %s", msc_filename, strerror(errno));
-  rv = lfds611_stack_new(&g_msc_memory_stack_p, (lfds611_atom_t)max_threadsP + 2);
 
+  rv = lfds611_stack_new(&g_msc_memory_stack_p, (lfds611_atom_t)max_threadsP + 2);
   if (0 >= rv) {
     AssertFatal (0, "lfds611_stack_new failed!\n");
   }
@@ -149,7 +153,7 @@ int msc_init(const msc_env_t envP, const int max_threadsP)
   for (i=0; i < max_threadsP * 30; i++) {
     pointer_p = malloc(MSC_MAX_MESSAGE_LENGTH);
     AssertFatal (pointer_p, "malloc failed!\n");
-    rv = lfds611_stack_guaranteed_push( g_msc_memory_stack_p, pointer_p );
+ 	rv = lfds611_stack_guaranteed_push( g_msc_memory_stack_p, pointer_p );
     AssertFatal (rv, "lfds611_stack_guaranteed_push failed for item %u\n", i);
   }
 
@@ -157,335 +161,182 @@ int msc_init(const msc_env_t envP, const int max_threadsP)
     switch (i) {
       case MSC_IP_UE:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "IP_UE");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_IP_ENB:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "IP_ENB");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if (envP == MSC_E_UTRAN_LIPA) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_NAS_UE:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "NAS_UE");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_RRC_UE:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "RRC_UE");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_PDCP_UE:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "PDCP_UE");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_RLC_UE:
-        rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "RLC_UE");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
-        if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
+    	rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "RLC_UE");
+    	if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
+    	if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_MAC_UE:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "MAC_UE");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
-          msc_log_declare_proto(i);
+      	  msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_PHY_UE:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "PHY_UE");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_PHY_ENB:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "PHY_ENB");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_MAC_ENB:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "MAC_ENB");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_RLC_ENB:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "RLC_ENB");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_PDCP_ENB:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "PDCP_ENB");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_RRC_ENB:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "RRC_ENB");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_S1AP_ENB:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "S1AP_ENB");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if ((envP == MSC_E_UTRAN) || (envP == MSC_MME_GW)  || (envP == MSC_MME)) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_GTPU_ENB:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "GTPU_ENB");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_GTPU_SGW:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "GTPU_SGW");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if ((envP == MSC_MME_GW) || (envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_S1AP_MME:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "S1AP_MME");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if ((envP == MSC_MME_GW) || (envP == MSC_MME) || (envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_MMEAPP_MME:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "MME_APP");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if ((envP == MSC_MME_GW) || (envP == MSC_MME)) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_NAS_MME:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "NAS_MME");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         msc_log_declare_proto(i);
         break;
-
       case MSC_NAS_EMM_MME:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "NAS_EMM");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if ((envP == MSC_MME_GW) || (envP == MSC_MME)) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_NAS_ESM_MME:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "NAS_ESM");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if ((envP == MSC_MME_GW) || (envP == MSC_MME)) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_SP_GWAPP_MME:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "SP_GW_MME");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if (envP == MSC_MME_GW) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_S11_MME:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "S11_MME");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if (envP == MSC_MME) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_S6A_MME:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "S6A");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if ((envP == MSC_MME_GW) || (envP == MSC_MME)) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       case MSC_HSS:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "HSS");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
-
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
         if ((envP == MSC_MME_GW) || (envP == MSC_MME)) {
           msc_log_declare_proto(i);
         }
-
         break;
-
       default:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "UNKNOWN");
-
-        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
-          g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
-        }
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
     }
   }
-
   rv = itti_create_task (TASK_MSC, msc_task, NULL);
   AssertFatal (rv == 0, "Create task for MSC failed!\n");
   fprintf(stderr, "Initializing MSC logs Done\n");
@@ -508,17 +359,15 @@ void msc_flush_messages(void)
   int               rv;
   msc_queue_item_t *item_p = NULL;
 
-  while ((rv = lfds611_queue_dequeue( g_msc_message_queue_p, (void **)&item_p )) == 1) {
-    if (NULL != item_p->message_str) {
-      fputs(item_p->message_str, g_msc_fd);
-      // TODO BIN DATA
-      rv = lfds611_stack_guaranteed_push( g_msc_memory_stack_p, item_p->message_str );
-    }
-
-    // TODO FREE BIN DATA
-    free(item_p);
+  while ((rv = lfds611_queue_dequeue( g_msc_message_queue_p, (void**)&item_p )) == 1) {
+	if (NULL != item_p->message_str) {
+	  fputs(item_p->message_str, g_msc_fd);
+	  // TODO BIN DATA
+	  rv = lfds611_stack_guaranteed_push( g_msc_memory_stack_p, item_p->message_str );
+	}
+	// TODO FREE BIN DATA
+	free(item_p);
   }
-
   fflush(g_msc_fd);
 }
 
@@ -528,27 +377,23 @@ void msc_end(void)
 //------------------------------------------------------------------------------
 {
   int rv;
-
   if (NULL != g_msc_fd ) {
-    msc_flush_messages();
+	msc_flush_messages();
     rv = fflush(g_msc_fd);
-
-    if (rv != 0) {
-      fprintf(stderr, "Error while flushing stream of MSC log file: %s", strerror(errno));
+	if (rv != 0) {
+	  fprintf(stderr, "Error while flushing stream of MSC log file: %s", strerror(errno));
     }
-
     rv = fclose(g_msc_fd);
-
     if (rv != 0) {
-      fprintf(stderr, "Error while closing MSC log file: %s", strerror(errno));
+     fprintf(stderr, "Error while closing MSC log file: %s", strerror(errno));
     }
   }
 }
 
 //------------------------------------------------------------------------------
 void msc_log_declare_proto(
-  const msc_proto_t  protoP
-)
+    const msc_proto_t  protoP
+  )
 //------------------------------------------------------------------------------
 {
   int               rv             = 0;
@@ -556,55 +401,47 @@ void msc_log_declare_proto(
   char             *char_message_p = NULL;
 
   if ((MIN_MSC_PROTOS <= protoP) && (MAX_MSC_PROTOS > protoP)) {
-    // may be build a memory pool for that also ?
-    new_item_p = malloc(sizeof(msc_queue_item_t));
+	// may be build a memory pool for that also ?
+	new_item_p = malloc(sizeof(msc_queue_item_t));
+	if (NULL != new_item_p) {
 
-    if (NULL != new_item_p) {
-      rv = lfds611_stack_pop(g_msc_memory_stack_p, (void **)&char_message_p);
-
-      if (0 == rv) {
-        msc_flush_messages();
-        rv = lfds611_stack_pop(g_msc_memory_stack_p, (void **)&char_message_p);
-      }
-
-      if (1 == rv) {
+	  rv = lfds611_stack_pop(g_msc_memory_stack_p, (void**)&char_message_p);
+	  if (0 == rv) {
+		  msc_flush_messages();
+		  rv = lfds611_stack_pop(g_msc_memory_stack_p, (void**)&char_message_p);
+	  }
+	  if (1 == rv) {
         rv = snprintf(char_message_p, MSC_MAX_MESSAGE_LENGTH, "%"PRIu64" [PROTO] %d %s\n", __sync_fetch_and_add (&g_message_number, 1), protoP, &g_msc_proto2str[protoP][0]);
-
         if (0 > rv) {
           fprintf(stderr, "Error while declaring new protocol in MSC: %s", strerror(errno));
         }
-
         new_item_p->message_str       = char_message_p;
         new_item_p->message_str_size  = rv;
         new_item_p->message_bin       = NULL;
         new_item_p->message_bin_size  = 0;
         rv = lfds611_queue_enqueue( g_msc_message_queue_p, new_item_p );
-
-        if (0 == rv) {
-          rv = lfds611_queue_guaranteed_enqueue(g_msc_message_queue_p, new_item_p );
-
-          if (0 == rv) {
+	    if (0 == rv) {
+	      rv = lfds611_queue_guaranteed_enqueue(g_msc_message_queue_p, new_item_p );
+		  if (0 == rv) {
             fprintf(stderr, "Error while lfds611_queue_guaranteed_enqueue message %s in MSC", char_message_p);
-            rv = lfds611_stack_guaranteed_push( g_msc_memory_stack_p, char_message_p );
-            free(new_item_p);
-          }
-        }
-
-        return;
-      } else {
-        fprintf(stderr, "Error while lfds611_stack_pop()\n");
-      }
-
+      	    rv = lfds611_stack_guaranteed_push( g_msc_memory_stack_p, char_message_p );
+      	    free(new_item_p);
+		  }
+	    }
+	    return;
+	  } else {
+	      fprintf(stderr, "Error while lfds611_stack_pop()\n");
+	  }
       free(new_item_p);
-    } else {
+	} else {
       fprintf(stderr, "Error while malloc in MSC");
-    }
+	}
   }
 }
 //------------------------------------------------------------------------------
 void msc_log_event(
-  const msc_proto_t  protoP,
-  char *format, ...)
+    const msc_proto_t  protoP,
+    char *format, ...)
 //------------------------------------------------------------------------------
 {
   va_list           args;
@@ -613,62 +450,52 @@ void msc_log_event(
   msc_queue_item_t *new_item_p     = NULL;
   char             *char_message_p = NULL;
 
+
   if ((MIN_MSC_PROTOS > protoP) || (MAX_MSC_PROTOS <= protoP)) {
-    return;
+      return;
   }
-
   new_item_p = malloc(sizeof(msc_queue_item_t));
-
   if (NULL != new_item_p) {
-    rv = lfds611_stack_pop(g_msc_memory_stack_p, (void **)&char_message_p);
 
+    rv = lfds611_stack_pop(g_msc_memory_stack_p, (void**)&char_message_p);
     if (0 == rv) {
       msc_flush_messages();
-      rv = lfds611_stack_pop(g_msc_memory_stack_p, (void **)&char_message_p);
+      rv = lfds611_stack_pop(g_msc_memory_stack_p, (void**)&char_message_p);
     }
-
     if (1 == rv) {
       rv = snprintf(char_message_p, MSC_MAX_MESSAGE_LENGTH, "%"PRIu64" [EVENT] %d ",  __sync_fetch_and_add (&g_message_number, 1), protoP);
-
       if ((0 > rv) || (MSC_MAX_MESSAGE_LENGTH < rv)) {
         fprintf(stderr, "Error while logging MSC event : %s", &g_msc_proto2str[protoP][0]);
         goto error_event;
       }
-
       va_start(args, format);
       rv2 = vsnprintf(&char_message_p[rv],MSC_MAX_MESSAGE_LENGTH - rv,  format, args);
       va_end(args);
-
       if ((0 > rv2) || ((MSC_MAX_MESSAGE_LENGTH - rv) < rv2)) {
         fprintf(stderr, "Error while logging MSC event : %s", &g_msc_proto2str[protoP][0]);
         goto error_event;
       }
-
       rv += rv2;
       rv2 = snprintf(&char_message_p[rv],MSC_MAX_MESSAGE_LENGTH - rv, "\n");
-
       if ((0 > rv2) || ((MSC_MAX_MESSAGE_LENGTH - rv) < rv2)) {
         fprintf(stderr, "Error while logging MSC event : %s", &g_msc_proto2str[protoP][0]);
         goto error_event;
       }
-
       rv += rv2;
       new_item_p->message_str       = char_message_p;
       new_item_p->message_str_size  = rv;
       new_item_p->message_bin       = NULL;
       new_item_p->message_bin_size  = 0;
       rv = lfds611_queue_enqueue( g_msc_message_queue_p, new_item_p );
-
-      if (0 == rv) {
+	  if (0 == rv) {
         fprintf(stderr, "Error while lfds611_queue_guaranteed_enqueue message %s in MSC", char_message_p);
-        rv = lfds611_stack_guaranteed_push( g_msc_memory_stack_p, char_message_p );
-        free(new_item_p);
-      }
+    	rv = lfds611_stack_guaranteed_push( g_msc_memory_stack_p, char_message_p );
+    	free(new_item_p);
+	  }
     } else {
       fprintf(stderr, "Error while lfds611_stack_pop()\n");
-    }
+	}
   }
-
   return;
 error_event:
   rv = lfds611_stack_guaranteed_push( g_msc_memory_stack_p, char_message_p );
@@ -676,12 +503,12 @@ error_event:
 }
 //------------------------------------------------------------------------------
 void msc_log_message(
-  const char *const message_operationP,
-  const msc_proto_t  proto1P,
-  const msc_proto_t  proto2P,
-  const uint8_t *const bytesP,
-  const unsigned int num_bytes,
-  char *format, ...)
+    const char * const message_operationP,
+    const msc_proto_t  proto1P,
+    const msc_proto_t  proto2P,
+    const uint8_t * const bytesP,
+    const unsigned int num_bytes,
+    char *format, ...)
 //------------------------------------------------------------------------------
 {
   va_list           args;
@@ -691,65 +518,56 @@ void msc_log_message(
   msc_queue_item_t *new_item_p     = NULL;
   char             *char_message_p = NULL;
 
+
   if ((MIN_MSC_PROTOS > proto1P) || (MAX_MSC_PROTOS <= proto1P) ||
-      (MIN_MSC_PROTOS > proto2P)   || (MAX_MSC_PROTOS <= proto2P)  ) {
+	  (MIN_MSC_PROTOS > proto2P)   || (MAX_MSC_PROTOS <= proto2P)  ) {
     return;
   }
 
   new_item_p = malloc(sizeof(msc_queue_item_t));
-
   if (NULL != new_item_p) {
-    rv = lfds611_stack_pop(g_msc_memory_stack_p, (void **)&char_message_p);
 
+    rv = lfds611_stack_pop(g_msc_memory_stack_p, (void**)&char_message_p);
     if (0 == rv) {
       msc_flush_messages();
-      rv = lfds611_stack_pop(g_msc_memory_stack_p, (void **)&char_message_p);
-    }
-
+      rv = lfds611_stack_pop(g_msc_memory_stack_p, (void**)&char_message_p);
+	}
     if (1 == rv) {
       rv = snprintf(char_message_p, MSC_MAX_MESSAGE_LENGTH, "%"PRIu64" [MESSAGE] %d %s %d %"PRIu64" ",
-                    __sync_fetch_and_add (&g_message_number, 1), proto1P, message_operationP, proto2P, mac);
-
+    		  __sync_fetch_and_add (&g_message_number, 1), proto1P, message_operationP, proto2P, mac);
       if ((0 > rv) || (MSC_MAX_MESSAGE_LENGTH < rv)) {
         fprintf(stderr, "Error while logging MSC message : %s/%s", &g_msc_proto2str[proto1P][0], &g_msc_proto2str[proto2P][0]);
         goto error_event;
       }
-
       va_start(args, format);
       rv2 = vsnprintf(&char_message_p[rv],MSC_MAX_MESSAGE_LENGTH - rv,  format, args);
       va_end(args);
-
       if ((0 > rv2) || ((MSC_MAX_MESSAGE_LENGTH - rv) < rv2)) {
         fprintf(stderr, "Error while logging MSC message : %s/%s", &g_msc_proto2str[proto1P][0], &g_msc_proto2str[proto2P][0]);
         goto error_event;
       }
-
       rv += rv2;
       rv2 = snprintf(&char_message_p[rv],MSC_MAX_MESSAGE_LENGTH - rv, "\n");
-
       if ((0 > rv2) || ((MSC_MAX_MESSAGE_LENGTH - rv) < rv2)) {
         fprintf(stderr, "Error while logging MSC message : %s/%s", &g_msc_proto2str[proto1P][0], &g_msc_proto2str[proto2P][0]);
         goto error_event;
       }
-
       rv += rv2;
       new_item_p->message_str       = char_message_p;
       new_item_p->message_str_size  = rv;
       new_item_p->message_bin       = NULL; // TO DO
       new_item_p->message_bin_size  = 0;    // TO DO
       rv = lfds611_queue_enqueue( g_msc_message_queue_p, new_item_p );
-
-      if (0 == rv) {
+	  if (0 == rv) {
         fprintf(stderr, "Error while lfds611_queue_guaranteed_enqueue message %s in MSC", char_message_p);
-        rv = lfds611_stack_guaranteed_push( g_msc_memory_stack_p, char_message_p );
-        free(new_item_p);
-      }
+    	rv = lfds611_stack_guaranteed_push( g_msc_memory_stack_p, char_message_p );
+    	free(new_item_p);
+	  }
     } else {
       fprintf(stderr, "Error while lfds611_stack_pop()\n");
       msc_flush_messages();
-    }
+  	}
   }
-
   return;
 error_event:
   rv = lfds611_stack_guaranteed_push( g_msc_memory_stack_p, char_message_p );
@@ -760,7 +578,8 @@ error_event:
 //  function called when oai loader loads the msc shared lib
 int msc_autoinit(msc_interface_t *msc_interface)
 //------------------------------------------------------------------------------
-{
+ {
+
   msc_interface->msc_init = msc_init;
   msc_interface->msc_start_use = msc_start_use;
   msc_interface->msc_end = msc_end;
@@ -768,4 +587,4 @@ int msc_autoinit(msc_interface_t *msc_interface)
   msc_interface->msc_log_message = msc_log_message;
   msc_interface->msc_loaded = 1;
   return 0;
-}
+ }

common/utils/msc/msc.h

@@ -25,46 +25,46 @@
 #include <stdint.h>
 
 typedef enum {
-  MIN_MSC_ENV = 0,
-  MSC_E_UTRAN = MIN_MSC_ENV,
-  MSC_E_UTRAN_LIPA,
-  MSC_MME_GW,
-  MSC_MME,
-  MSC_SP_GW,
-  MAX_MSC_ENV
+	MIN_MSC_ENV = 0,
+    MSC_E_UTRAN = MIN_MSC_ENV,
+    MSC_E_UTRAN_LIPA,
+    MSC_MME_GW,
+    MSC_MME,
+    MSC_SP_GW,
+    MAX_MSC_ENV
 } msc_env_t;
 
 
 typedef enum {
-  MIN_MSC_PROTOS = 0,
-  MSC_IP_UE = MIN_MSC_PROTOS,
-  MSC_NAS_UE,
-  MSC_RRC_UE,
-  MSC_PDCP_UE,
-  MSC_RLC_UE,
-  MSC_MAC_UE,
-  MSC_PHY_UE,
-  MSC_PHY_ENB,
-  MSC_MAC_ENB,
-  MSC_RLC_ENB,
-  MSC_PDCP_ENB,
-  MSC_RRC_ENB,
-  MSC_IP_ENB,
-  MSC_S1AP_ENB,
-  MSC_GTPU_ENB,
-  MSC_GTPU_SGW,
-  MSC_S1AP_MME,
-  MSC_MMEAPP_MME,
-  MSC_NAS_MME,
-  MSC_NAS_EMM_MME,
-  MSC_NAS_ESM_MME,
-  MSC_SP_GWAPP_MME,
-  MSC_S11_MME,
-  MSC_S6A_MME,
-  MSC_HSS,
-  MAX_MSC_PROTOS,
-  MSC_X2AP_SRC_ENB,
-  MSC_X2AP_TARGET_ENB,
+    MIN_MSC_PROTOS = 0,
+    MSC_IP_UE = MIN_MSC_PROTOS,
+    MSC_NAS_UE,
+    MSC_RRC_UE,
+    MSC_PDCP_UE,
+    MSC_RLC_UE,
+    MSC_MAC_UE,
+    MSC_PHY_UE,
+    MSC_PHY_ENB,
+    MSC_MAC_ENB,
+    MSC_RLC_ENB,
+    MSC_PDCP_ENB,
+    MSC_RRC_ENB,
+    MSC_IP_ENB,
+    MSC_S1AP_ENB,
+    MSC_GTPU_ENB,
+    MSC_GTPU_SGW,
+    MSC_S1AP_MME,
+    MSC_MMEAPP_MME,
+    MSC_NAS_MME,
+    MSC_NAS_EMM_MME,
+    MSC_NAS_ESM_MME,
+    MSC_SP_GWAPP_MME,
+    MSC_S11_MME,
+    MSC_S6A_MME,
+    MSC_HSS,
+    MAX_MSC_PROTOS,
+    MSC_X2AP_SRC_ENB,
+    MSC_X2AP_TARGET_ENB,
 } msc_proto_t;
 
 
@@ -73,22 +73,22 @@ typedef enum {
 #define MSC_AS_TIME_FMT "%05u:%02u"
 
 #define MSC_AS_TIME_ARGS(CTXT_Pp) \
-  (CTXT_Pp)->frame, \
-  (CTXT_Pp)->subframe
+    (CTXT_Pp)->frame, \
+    (CTXT_Pp)->subframe
 
 typedef int(*msc_init_t)(const msc_env_t, const int );
 typedef void(*msc_start_use_t)(void );
 typedef void(*msc_end_t)(void);
 typedef void(*msc_log_event_t)(const msc_proto_t,char *, ...);
-typedef void(*msc_log_message_t)(const char    *const, const msc_proto_t, const msc_proto_t,
-                                 const uint8_t *const, const unsigned int, char *, ...);
+typedef void(*msc_log_message_t)(const char *   const, const msc_proto_t, const msc_proto_t, 
+                                 const uint8_t* const, const unsigned int, char * , ...);
 typedef struct msc_interface {
-  int               msc_loaded;
-  msc_init_t        msc_init;
-  msc_start_use_t   msc_start_use;
-  msc_end_t         msc_end;
-  msc_log_event_t   msc_log_event;
-  msc_log_message_t msc_log_message;
+    int               msc_loaded;
+    msc_init_t        msc_init;
+    msc_start_use_t   msc_start_use;
+    msc_end_t         msc_end;
+    msc_log_event_t   msc_log_event;
+    msc_log_message_t msc_log_message;
 } msc_interface_t;
 
 #ifdef MSC_LIBRARY
@@ -99,17 +99,15 @@ void msc_end(void);
 void msc_log_declare_proto(const msc_proto_t  protoP);
 void msc_log_event(const msc_proto_t  protoP,char *format, ...);
 void msc_log_message(
-  const char *const message_operationP,
-  const msc_proto_t  receiverP,
-  const msc_proto_t  senderP,
-  const uint8_t *const bytesP,
-  const unsigned int num_bytes,
-  char *format, ...);
+	const char * const message_operationP,
+    const msc_proto_t  receiverP,
+    const msc_proto_t  senderP,
+    const uint8_t* const bytesP,
+    const unsigned int num_bytes,
+    char *format, ...);
 
 #else
 
-#define MESSAGE_CHART_GENERATOR  msc_interface.msc_loaded
-
 msc_interface_t msc_interface;
 #define MSC_INIT(arg1,arg2)                                     if(msc_interface.msc_loaded) msc_interface.msc_init(arg1,arg2)
 #define MSC_START_USE                                           if(msc_interface.msc_loaded) msc_interface.msc_start_use
@@ -121,4 +119,4 @@ msc_interface_t msc_interface;
 #define MSC_LOG_TX_MESSAGE_FAILED(sENDER, rECEIVER, bYTES, nUMbYTES, fORMAT, aRGS...)    if(msc_interface.msc_loaded) msc_interface.msc_log_message("-x",sENDER, rECEIVER, (const uint8_t *)bYTES, nUMbYTES, fORMAT, ##aRGS)
 #endif
 
-#endif
+#endif 

common/utils/telnetsrv/DOC/telnetlog.md

@@ -92,5 +92,4 @@ Connection closed by foreign host.
 ```  
 
 [oai telnetserver home](telnetsrv.md)  
-[oai telnetserver usage home](telnetusage.md)
-[oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
+[oai telnetserver usage home](telnetusage.md)

common/utils/time_utils.h

@@ -0,0 +1,23 @@
+#ifndef _TIME_UTILS_H_
+#define _TIME_UTILS_H_
+
+#include <time.h>
+#include <stdint.h>
+
+static inline int64_t clock_difftime_ns(struct timespec start, struct timespec end)
+{
+  struct timespec temp;
+  int64_t temp_ns;
+
+  if ((end.tv_nsec-start.tv_nsec)<0) {
+    temp.tv_sec = end.tv_sec-start.tv_sec-1;
+    temp.tv_nsec = 1000000000+end.tv_nsec-start.tv_nsec;
+  } else {
+    temp.tv_sec = end.tv_sec-start.tv_sec;
+    temp.tv_nsec = end.tv_nsec-start.tv_nsec;
+  }
+  temp_ns = (int64_t)(temp.tv_sec) * (int64_t)1000000000 + (temp.tv_nsec);
+  return temp_ns;
+}
+
+#endif /* _TIME_UTILS_H_ */

doc/FEATURE_SET.md

@@ -8,8 +8,7 @@
    5. [eNB RRC Layer](#enb-rrc-layer)
    6. [eNB X2AP](#enb-x2ap)
    7. [eNB Advanced Features](#enb-advanced-features)
-2. [OpenAirInterface Functional Split](#openairinterface-functional-split)
-3. [OpenAirInterface UE Feature Set](#openairinterface-ue-feature-set)
+2. [OpenAirInterface UE Feature Set](#openairinterface-ue-feature-set)
    1.  [LTE UE PHY Layer](#lte-ue-phy-layer)
    2.  [LTE UE MAC Layer](#lte-ue-mac-layer)
    3.  [LTE UE RLC Layer](#lte-ue-rlc-layer)
@@ -129,18 +128,6 @@ The X2AP layer is based on **3GPP 36.423** v14.6.0 and implements the following
 
 **To be completed**
 
-# OpenAirInterface Functional Split #
-
--  RCC: Radio-Cloud Center
--  RAU: Radio-Access Unit
--  RRU: Remote Radio-Unit
-
-![Functional Split Architecture](./oai_lte_enb_func_split_arch.png)
-
--  IF4.5 / IF5 : similar to IEEE P1914.1
--  FAPI (IF2)  : specified by Small Cell Forum (open-nFAPI implementation)
--  IF1         : F1 in 3GPP Release 15 (not implemented yet)
-
 # OpenAirInterface UE Feature Set #
 
 ## LTE UE PHY Layer ##
@@ -182,10 +169,3 @@ The RRC layer is based on **3GPP 36.331** v14.3.0 and implements the following f
 
 - System Information decoding
 - RRC connection establishment
-
-## LTE UE NAS Layer ##
-
-The NAS layer is based on **3GPP 24.301** and implements the following functions:
-
-- EMM attach/detach, authentication, tracking area update, and more
-- ESM default/dedicated bearer, PDN connectivity, and more

nfapi/oai_integration/nfapi_pnf.c

@@ -69,12 +69,12 @@ char uecap_xer_in;
 
 extern void init_eNB_afterRU(void);
 extern void init_UE_stub(int nb_inst,int,int);
-extern void handle_nfapi_dci_dl_pdu(PHY_VARS_eNB *eNB, int frame, int subframe, L1_rxtx_proc_t *proc, nfapi_dl_config_request_pdu_t *dl_config_pdu);
-extern void handle_nfapi_ul_pdu(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc, nfapi_ul_config_request_pdu_t *ul_config_pdu, uint16_t frame,uint8_t subframe,uint8_t srs_present);
-extern void handle_nfapi_dlsch_pdu(PHY_VARS_eNB *eNB,int frame, int subframe, L1_rxtx_proc_t *proc,  nfapi_dl_config_request_pdu_t *dl_config_pdu, uint8_t codeword_index, uint8_t *sdu);
-extern void handle_nfapi_hi_dci0_dci_pdu(PHY_VARS_eNB *eNB,int frame, int subframe, L1_rxtx_proc_t *proc, nfapi_hi_dci0_request_pdu_t *hi_dci0_config_pdu);
-extern void handle_nfapi_hi_dci0_hi_pdu(PHY_VARS_eNB *eNB,int frame, int subframe, L1_rxtx_proc_t *proc, nfapi_hi_dci0_request_pdu_t *hi_dci0_config_pdu);
-extern void handle_nfapi_bch_pdu(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc, nfapi_dl_config_request_pdu_t *dl_config_pdu, uint8_t *sdu);
+extern void handle_nfapi_dci_dl_pdu(PHY_VARS_eNB *eNB, int frame, int subframe, eNB_rxtx_proc_t *proc, nfapi_dl_config_request_pdu_t *dl_config_pdu);
+extern void handle_nfapi_ul_pdu(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc, nfapi_ul_config_request_pdu_t *ul_config_pdu, uint16_t frame,uint8_t subframe,uint8_t srs_present);
+extern void handle_nfapi_dlsch_pdu(PHY_VARS_eNB *eNB,int frame, int subframe, eNB_rxtx_proc_t *proc,  nfapi_dl_config_request_pdu_t *dl_config_pdu, uint8_t codeword_index, uint8_t *sdu);
+extern void handle_nfapi_hi_dci0_dci_pdu(PHY_VARS_eNB *eNB,int frame, int subframe, eNB_rxtx_proc_t *proc, nfapi_hi_dci0_request_pdu_t *hi_dci0_config_pdu);
+extern void handle_nfapi_hi_dci0_hi_pdu(PHY_VARS_eNB *eNB,int frame, int subframe, eNB_rxtx_proc_t *proc, nfapi_hi_dci0_request_pdu_t *hi_dci0_config_pdu);
+extern void handle_nfapi_bch_pdu(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc, nfapi_dl_config_request_pdu_t *dl_config_pdu, uint8_t *sdu);
 
 extern uint8_t  nfapi_mode;
 
@@ -741,7 +741,7 @@ int pnf_phy_hi_dci0_req(nfapi_pnf_p7_config_t* pnf_p7, nfapi_hi_dci0_request_t*
   //phy_info* phy = (phy_info*)(pnf_p7->user_data);
 
   struct PHY_VARS_eNB_s *eNB = RC.eNB[0][0];
-  L1_rxtx_proc_t *proc = &eNB->proc.L1_proc;
+  eNB_rxtx_proc_t *proc = &eNB->proc.proc_rxtx[0];
 
   for (int i=0; i<req->hi_dci0_request_body.number_of_dci + req->hi_dci0_request_body.number_of_hi; i++) {
 
@@ -798,7 +798,7 @@ int pnf_phy_dl_config_req(nfapi_pnf_p7_config_t* pnf_p7, nfapi_dl_config_request
   int sf = NFAPI_SFNSF2SF(req->sfn_sf);
 
   struct PHY_VARS_eNB_s *eNB = RC.eNB[0][0];
-  L1_rxtx_proc_t *proc = &eNB->proc.L1_proc;
+  eNB_rxtx_proc_t *proc = &eNB->proc.proc_rxtx[0];
   nfapi_dl_config_request_pdu_t* dl_config_pdu_list = req->dl_config_request_body.dl_config_pdu_list;
   LTE_eNB_PDCCH *pdcch_vars = &eNB->pdcch_vars[sf&1];
 
@@ -869,7 +869,7 @@ int pnf_phy_dl_config_req(nfapi_pnf_p7_config_t* pnf_p7, nfapi_dl_config_request
 
         //NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() DLSCH:pdu_index:%d handle_nfapi_dlsch_pdu(eNB, proc_rxtx, dlsch_pdu, transport_blocks:%d sdu:%p) eNB->pdcch_vars[proc->subframe_tx & 1].num_pdcch_symbols:%d\n", __FUNCTION__, rel8_pdu->pdu_index, rel8_pdu->transport_blocks, dlsch_sdu, eNB->pdcch_vars[proc->subframe_tx & 1].num_pdcch_symbols);
 
-        handle_nfapi_dlsch_pdu( eNB, sfn,sf, &eNB->proc.L1_proc, &dl_config_pdu_list[i], rel8_pdu->transport_blocks-1, dlsch_sdu);
+        handle_nfapi_dlsch_pdu( eNB, sfn,sf, &eNB->proc.proc_rxtx[0], &dl_config_pdu_list[i], rel8_pdu->transport_blocks-1, dlsch_sdu);
 
       } else {
 
@@ -945,7 +945,7 @@ int pnf_phy_ul_config_req(nfapi_pnf_p7_config_t* pnf_p7, nfapi_ul_config_request
   uint16_t curr_sf = NFAPI_SFNSF2SF(req->sfn_sf);
 
   struct PHY_VARS_eNB_s *eNB = RC.eNB[0][0];
-  L1_rxtx_proc_t *proc = &eNB->proc.L1_proc;
+  eNB_rxtx_proc_t *proc = &eNB->proc.proc_rxtx[0];
   nfapi_ul_config_request_pdu_t* ul_config_pdu_list = req->ul_config_request_body.ul_config_pdu_list;
 
   for (int i=0;i<req->ul_config_request_body.number_of_pdus;i++) {

nfapi/oai_integration/nfapi_vnf.c

@@ -196,12 +196,14 @@ void oai_create_enb(void) {
   int bodge_counter=0;
   PHY_VARS_eNB *eNB = RC.eNB[0][0];
 
-  printf("[VNF] RC.eNB[0][0]. Mod_id:%d CC_id:%d nb_CC[0]:%d abstraction_flag:%d single_thread_flag:%d if_inst:%p\n", eNB->Mod_id, eNB->CC_id, RC.nb_CC[0], eNB->abstraction_flag, eNB->single_thread_flag, eNB->if_inst);
+  printf("[VNF] RC.eNB[0][0]. Mod_id:%d CC_id:%d nb_CC[0]:%d abstraction_flag:%d single_thread_flag:%d td:%p te:%p if_inst:%p\n", eNB->Mod_id, eNB->CC_id, RC.nb_CC[0], eNB->abstraction_flag, eNB->single_thread_flag, eNB->td, eNB->te, eNB->if_inst);
 
   eNB->Mod_id  = bodge_counter;
   eNB->CC_id   = bodge_counter;
   eNB->abstraction_flag   = 0;
   eNB->single_thread_flag = 0;//single_thread_flag;
+  eNB->td                   = ulsch_decoding_data_all;//(single_thread_flag==1) ? ulsch_decoding_data_2thread : ulsch_decoding_data;
+  eNB->te                   = dlsch_encoding_all;//(single_thread_flag==1) ? dlsch_encoding_2threads : dlsch_encoding;
 
   RC.nb_CC[bodge_counter] = 1;
 
@@ -270,7 +272,6 @@ int pnf_param_resp_cb(nfapi_vnf_config_t* config, int p5_idx, nfapi_pnf_param_re
   for(int i = 0; i < resp->pnf_phy.number_of_phys; ++i)
   {
     phy_info phy;
-    memset(&phy,0,sizeof(phy));
     phy.index = resp->pnf_phy.phy[i].phy_config_index;
 
     printf("[VNF] (PHY:%d) phy_config_idx:%d\n", i, resp->pnf_phy.phy[i].phy_config_index);
@@ -288,7 +289,6 @@ int pnf_param_resp_cb(nfapi_vnf_config_t* config, int p5_idx, nfapi_pnf_param_re
 
   for(int i = 0; i < resp->pnf_rf.number_of_rfs; ++i) {
     rf_info rf;
-    memset(&rf,0,sizeof(rf));
     rf.index = resp->pnf_rf.rf[i].rf_config_index;
 
     printf("[VNF] (RF:%d) rf_config_idx:%d\n", i, resp->pnf_rf.rf[i].rf_config_index);
@@ -343,9 +343,9 @@ int pnf_config_resp_cb(nfapi_vnf_config_t* config, int p5_idx, nfapi_pnf_config_
 
 int wake_eNB_rxtx(PHY_VARS_eNB *eNB, uint16_t sfn, uint16_t sf) {
 
-  L1_proc_t *proc=&eNB->proc;
+  eNB_proc_t *proc=&eNB->proc;
 
-  L1_rxtx_proc_t *L1_proc= (sf&1)? &proc->L1_proc : &proc->L1_proc_tx;
+  eNB_rxtx_proc_t *proc_rxtx=&proc->proc_rxtx[sf&1];
 
   LTE_DL_FRAME_PARMS *fp = &eNB->frame_parms;
 
@@ -359,8 +359,8 @@ int wake_eNB_rxtx(PHY_VARS_eNB *eNB, uint16_t sfn, uint16_t sf) {
 
   // wake up TX for subframe n+sf_ahead
   // lock the TX mutex and make sure the thread is ready
-  if (pthread_mutex_timedlock(&L1_proc->mutex,&wait) != 0) {
-    LOG_E( PHY, "[eNB] ERROR pthread_mutex_lock for eNB RXTX thread %d (IC %d)\n", L1_proc->subframe_rx&1,L1_proc->instance_cnt );
+  if (pthread_mutex_timedlock(&proc_rxtx->mutex_rxtx,&wait) != 0) {
+    LOG_E( PHY, "[eNB] ERROR pthread_mutex_lock for eNB RXTX thread %d (IC %d)\n", proc_rxtx->subframe_rx&1,proc_rxtx->instance_cnt_rxtx );
     exit_fun( "error locking mutex_rxtx" );
     return(-1);
   }
@@ -379,9 +379,9 @@ int wake_eNB_rxtx(PHY_VARS_eNB *eNB, uint16_t sfn, uint16_t sf) {
     if (old_sf == 0 && old_sfn % 100==0) LOG_W( PHY,"[eNB] sfn/sf:%d%d old_sfn/sf:%d%d proc[rx:%d%d]\n", sfn, sf, old_sfn, old_sf, proc->frame_rx, proc->subframe_rx);
   }
 
-  ++L1_proc->instance_cnt;
+  ++proc_rxtx->instance_cnt_rxtx;
 
-  //LOG_D( PHY,"[VNF-subframe_ind] sfn/sf:%d:%d proc[frame_rx:%d subframe_rx:%d] L1_proc->instance_cnt_rxtx:%d \n", sfn, sf, proc->frame_rx, proc->subframe_rx, L1_proc->instance_cnt_rxtx);
+  //LOG_D( PHY,"[VNF-subframe_ind] sfn/sf:%d:%d proc[frame_rx:%d subframe_rx:%d] proc_rxtx->instance_cnt_rxtx:%d \n", sfn, sf, proc->frame_rx, proc->subframe_rx, proc_rxtx->instance_cnt_rxtx);
 
   // We have just received and processed the common part of a subframe, say n.
   // TS_rx is the last received timestamp (start of 1st slot), TS_tx is the desired
@@ -389,23 +389,23 @@ int wake_eNB_rxtx(PHY_VARS_eNB *eNB, uint16_t sfn, uint16_t sf) {
   // The last (TS_rx mod samples_per_frame) was n*samples_per_tti,
   // we want to generate subframe (n+N), so TS_tx = TX_rx+N*samples_per_tti,
   // and proc->subframe_tx = proc->subframe_rx+sf_ahead
-  L1_proc->timestamp_tx = proc->timestamp_rx + (sf_ahead*fp->samples_per_tti);
-  L1_proc->frame_rx     = proc->frame_rx;
-  L1_proc->subframe_rx  = proc->subframe_rx;
-  L1_proc->frame_tx     = (L1_proc->subframe_rx > (9-sf_ahead)) ? (L1_proc->frame_rx+1)&1023 : L1_proc->frame_rx;
-  L1_proc->subframe_tx  = (L1_proc->subframe_rx + sf_ahead)%10;
+  proc_rxtx->timestamp_tx = proc->timestamp_rx + (sf_ahead*fp->samples_per_tti);
+  proc_rxtx->frame_rx     = proc->frame_rx;
+  proc_rxtx->subframe_rx  = proc->subframe_rx;
+  proc_rxtx->frame_tx     = (proc_rxtx->subframe_rx > (9-sf_ahead)) ? (proc_rxtx->frame_rx+1)&1023 : proc_rxtx->frame_rx;
+  proc_rxtx->subframe_tx  = (proc_rxtx->subframe_rx + sf_ahead)%10;
 
-  //LOG_D(PHY, "sfn/sf:%d%d proc[rx:%d%d] L1_proc[instance_cnt_rxtx:%d rx:%d%d] About to wake rxtx thread\n\n", sfn, sf, proc->frame_rx, proc->subframe_rx, L1_proc->instance_cnt_rxtx, L1_proc->frame_rx, L1_proc->subframe_rx);
+  //LOG_D(PHY, "sfn/sf:%d%d proc[rx:%d%d] proc_rxtx[instance_cnt_rxtx:%d rx:%d%d] About to wake rxtx thread\n\n", sfn, sf, proc->frame_rx, proc->subframe_rx, proc_rxtx->instance_cnt_rxtx, proc_rxtx->frame_rx, proc_rxtx->subframe_rx);
 
   // the thread can now be woken up
-  if (pthread_cond_signal(&L1_proc->cond) != 0) {
+  if (pthread_cond_signal(&proc_rxtx->cond_rxtx) != 0) {
     LOG_E( PHY, "[eNB] ERROR pthread_cond_signal for eNB RXn-TXnp4 thread\n");
     exit_fun( "ERROR pthread_cond_signal" );
     return(-1);
   }
 
   //LOG_D(PHY,"%s() About to attempt pthread_mutex_unlock\n", __FUNCTION__);
-  pthread_mutex_unlock( &L1_proc->mutex );
+  pthread_mutex_unlock( &proc_rxtx->mutex_rxtx );
   //LOG_D(PHY,"%s() UNLOCKED pthread_mutex_unlock\n", __FUNCTION__);
 
   return(0);
@@ -899,7 +899,7 @@ int param_resp_cb(nfapi_vnf_config_t* config, int p5_idx, nfapi_param_response_t
 
   // for now just 1
 
-  printf("[VNF] %d.%d pnf p7 %s:%d timing %u %u %u %u\n", p5_idx, phy->id, phy->remote_addr, phy->remote_port, p7_vnf->timing_window, p7_vnf->periodic_timing_period, p7_vnf->aperiodic_timing_enabled, p7_vnf->periodic_timing_period);
+  printf("[VNF] %d.%d pnf p7 %s:%d timing %d %d %d %d\n", p5_idx, phy->id, phy->remote_addr, phy->remote_port, p7_vnf->timing_window, p7_vnf->periodic_timing_period, p7_vnf->aperiodic_timing_enabled, p7_vnf->periodic_timing_period);
 
   req->header.message_id = NFAPI_CONFIG_REQUEST;
   req->header.phy_id = phy->id;
@@ -921,7 +921,7 @@ int param_resp_cb(nfapi_vnf_config_t* config, int p5_idx, nfapi_param_response_t
 
   req->nfapi_config.timing_window.tl.tag = NFAPI_NFAPI_TIMING_WINDOW_TAG;
   req->nfapi_config.timing_window.value = p7_vnf->timing_window;
-  printf("[VNF] Timing window:%u\n", p7_vnf->timing_window);
+  printf("[VNF] Timing window:%d\n", p7_vnf->timing_window);
   req->num_tlv++;
 
   if(p7_vnf->periodic_timing_enabled || p7_vnf->aperiodic_timing_enabled) {
@@ -1112,7 +1112,7 @@ int oai_nfapi_dl_config_req(nfapi_dl_config_request_t *dl_config_req)
   nfapi_vnf_p7_config_t *p7_config = vnf.p7_vnfs[0].config;
 
   dl_config_req->header.phy_id = 1; // DJP HACK TODO FIXME - need to pass this around!!!!
-  dl_config_req->header.message_id = NFAPI_DL_CONFIG_REQUEST;
+
   int retval = nfapi_vnf_p7_dl_config_req(p7_config, dl_config_req);
 
   dl_config_req->dl_config_request_body.number_pdcch_ofdm_symbols           = 1;
@@ -1131,7 +1131,7 @@ int oai_nfapi_tx_req(nfapi_tx_request_t *tx_req)
   nfapi_vnf_p7_config_t *p7_config = vnf.p7_vnfs[0].config;
 
   tx_req->header.phy_id = 1; // DJP HACK TODO FIXME - need to pass this around!!!!
-  tx_req->header.message_id = NFAPI_TX_REQUEST;
+
   //LOG_D(PHY, "[VNF] %s() TX_REQ sfn_sf:%d number_of_pdus:%d\n", __FUNCTION__, NFAPI_SFNSF2DEC(tx_req->sfn_sf), tx_req->tx_request_body.number_of_pdus);
 
   int retval = nfapi_vnf_p7_tx_req(p7_config, tx_req);
@@ -1149,7 +1149,7 @@ int oai_nfapi_hi_dci0_req(nfapi_hi_dci0_request_t *hi_dci0_req) {
   nfapi_vnf_p7_config_t *p7_config = vnf.p7_vnfs[0].config;
 
   hi_dci0_req->header.phy_id = 1; // DJP HACK TODO FIXME - need to pass this around!!!!
-  hi_dci0_req->header.message_id = NFAPI_HI_DCI0_REQUEST;
+
   //LOG_D(PHY, "[VNF] %s() HI_DCI0_REQ sfn_sf:%d dci:%d hi:%d\n", __FUNCTION__, NFAPI_SFNSF2DEC(hi_dci0_req->sfn_sf), hi_dci0_req->hi_dci0_request_body.number_of_dci, hi_dci0_req->hi_dci0_request_body.number_of_hi);
 
   int retval = nfapi_vnf_p7_hi_dci0_req(p7_config, hi_dci0_req);
@@ -1168,7 +1168,7 @@ int oai_nfapi_ul_config_req(nfapi_ul_config_request_t *ul_config_req) {
   nfapi_vnf_p7_config_t *p7_config = vnf.p7_vnfs[0].config;
 
   ul_config_req->header.phy_id = 1; // DJP HACK TODO FIXME - need to pass this around!!!!
-  ul_config_req->header.message_id = NFAPI_UL_CONFIG_REQUEST;
+
   //LOG_D(PHY, "[VNF] %s() header message_id:%02x\n", __FUNCTION__, ul_config_req->header.message_id);
 
   //LOG_D(PHY, "[VNF] %s() UL_CONFIG sfn_sf:%d PDUs:%d rach_prach_frequency_resources:%d srs_present:%d\n", __FUNCTION__, NFAPI_SFNSF2DEC(ul_config_req->sfn_sf), ul_config_req->ul_config_request_body.number_of_pdus, ul_config_req->ul_config_request_body.rach_prach_frequency_resources, ul_config_req->ul_config_request_body.srs_present);

nfapi/open-nFAPI/pnf/src/pnf.c

@@ -1237,11 +1237,11 @@ int pnf_connect(pnf_t* pnf)
 	}
 
 	struct addrinfo *p = servinfo;
+	int i = 0;
 	int connected = 0;
 
 	while(p != NULL && connected == 0)
 	{
-#ifdef NFAPI_TRACE_ENABLED
 		char* family = "Unknown";
 		char* address = "Unknown";
 		char _addr[128];
@@ -1261,7 +1261,6 @@ int pnf_connect(pnf_t* pnf)
 		}
 
 		NFAPI_TRACE(NFAPI_TRACE_NOTE, "Host address info  %d Family:%s Address:%s\n", i++, family, address);
-#endif
 
 		if (pnf->sctp)
 		{

nfapi/open-nFAPI/pnf/src/pnf_p7.c

@@ -379,7 +379,7 @@ static uint32_t get_sf_time(uint32_t now_hr, uint32_t sf_start_hr)
 {
 	if(now_hr < sf_start_hr)
 	{
-		//NFAPI_TRACE(NFAPI_TRACE_INFO, "now is earlier than start of subframe now_hr:%u sf_start_hr:%u\n", now_hr, sf_start_hr);
+		NFAPI_TRACE(NFAPI_TRACE_INFO, "now is earlier than start of subframe now_hr:%u sf_start_hr:%u\n", now_hr, sf_start_hr);
 		return 0;
 	}
 	else

nfapi/open-nFAPI/vnf/src/vnf_p7.c

@@ -1203,12 +1203,12 @@ void vnf_handle_ul_node_sync(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf_p7)
 
 			if(phy->in_sync == 0)
 			{
-				/*NFAPI_TRACE(NFAPI_TRACE_NOTE, "***** Adjusting VNF phy_id:%d SFN/SF (%s) from %d to %d (%d) mode:%s zeroCount:%u sync:%s\n",
+				NFAPI_TRACE(NFAPI_TRACE_NOTE, "***** Adjusting VNF phy_id:%d SFN/SF (%s) from %d to %d (%d) mode:%s zeroCount:%u sync:%s\n", 
 					ind.header.phy_id, (phy->in_sync ? "via sfn" : "now"),
 					NFAPI_SFNSF2DEC(curr_sfn_sf), NFAPI_SFNSF2DEC(new_sfn_sf), phy->adjustment, 
 					phy->filtered_adjust ? "FILTERED" : "ABSOLUTE",
 					phy->zero_count,
-					phy->in_sync ? "IN_SYNC" : "OUT_OF_SYNC");*/
+					phy->in_sync ? "IN_SYNC" : "OUT_OF_SYNC");
 
 				phy->sfn_sf = new_sfn_sf;
 			}

openair1/PHY/CODING/3gpplte_sse.c

@@ -26,9 +26,9 @@
    date: 09.2012
 */
 #ifndef TC_MAIN
-  #include "coding_defs.h"
+#include "coding_defs.h"
 #else
-  #include <stdint.h>
+#include <stdint.h>
 #endif
 #include <stdio.h>
 #include <string.h>
@@ -66,11 +66,11 @@ struct treillis {
   union {
     uint8x8_t systematic_andp1_64[3];
     char systematic_andp1_8[24];
-  } __attribute__((aligned(64)));
+  }__attribute__((aligned(64)));
   union {
     uint8x8_t parity2_64[3];
     char parity2_8[24];
-  } __attribute__((aligned(64)));
+  }__attribute__((aligned(64)));
   int exit_state;
 };
 #endif
@@ -79,20 +79,23 @@ struct treillis all_treillis[8][256];
 
 int all_treillis_initialized=0;
 
-static inline unsigned char threegpplte_rsc(unsigned char input,unsigned char *state) {
+static inline unsigned char threegpplte_rsc(unsigned char input,unsigned char *state)
+{
   unsigned char output;
   output = (input ^ (*state>>2) ^ (*state>>1))&1;
   *state = (((input<<2)^(*state>>1))^((*state>>1)<<2)^((*state)<<2))&7;
   return(output);
 }
 
-static inline void threegpplte_rsc_termination(unsigned char *x,unsigned char *z,unsigned char *state) {
+static inline void threegpplte_rsc_termination(unsigned char *x,unsigned char *z,unsigned char *state)
+{
   *z     = ((*state>>2) ^ (*state))   &1;
   *x     = ((*state)    ^ (*state>>1))   &1;
   *state = (*state)>>1;
 }
 
-static void treillis_table_init(void) {
+static void treillis_table_init(void)
+{
   //struct treillis t[][]=all_treillis;
   //t=memalign(16,sizeof(struct treillis)*8*256);
   int i, j,b;
@@ -111,8 +114,8 @@ static void treillis_table_init(void) {
         all_treillis[i][j].systematic_andp1_8[b*3]= (j&(1<<(7-b)))>>(7-b);
         v=threegpplte_rsc( all_treillis[i][j].systematic_andp1_8[b*3] ,
                            &current_state);
-        all_treillis[i][j].systematic_andp1_8[b*3+1]=v; // for the yparity1
-        //        all_treillis[i][j].parity1_8[b*3+1]=v; // for the yparity1
+	all_treillis[i][j].systematic_andp1_8[b*3+1]=v; // for the yparity1
+	//        all_treillis[i][j].parity1_8[b*3+1]=v; // for the yparity1
         all_treillis[i][j].parity2_8[b*3+2]=v; // for the yparity2
       }
 
@@ -125,12 +128,14 @@ static void treillis_table_init(void) {
 }
 
 
-char interleave_compact_byte(short *base_interleaver,unsigned char *input, unsigned char *output, int n) {
+char interleave_compact_byte(short * base_interleaver,unsigned char * input, unsigned char * output, int n)
+{
+
   char expandInput[768*8] __attribute__((aligned(32)));
   int i,loop=n>>4;
 #if defined(__x86_64__) || defined(__i386__)
 #ifndef __AVX2__
-  __m128i *i_128=(__m128i *)input, *o_128=(__m128i *)expandInput;
+  __m128i *i_128=(__m128i *)input, *o_128=(__m128i*)expandInput;
   __m128i tmp1, tmp2, tmp3, tmp4;
   __m128i BIT_MASK = _mm_set_epi8(  0b00000001,
                                     0b00000010,
@@ -148,41 +153,42 @@ char interleave_compact_byte(short *base_interleaver,unsigned char *input, unsig
                                     0b00100000,
                                     0b01000000,
                                     0b10000000);
+
 #else
-  __m256i *i_256=(__m256i *)input, *o_256=(__m256i *)expandInput;
+  __m256i *i_256=(__m256i *)input, *o_256=(__m256i*)expandInput;
   __m256i tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
   __m256i BIT_MASK = _mm256_set_epi8(  0b00000001,
-                                       0b00000010,
-                                       0b00000100,
-                                       0b00001000,
-                                       0b00010000,
-                                       0b00100000,
-                                       0b01000000,
-                                       0b10000000,
-                                       0b00000001,
-                                       0b00000010,
-                                       0b00000100,
-                                       0b00001000,
-                                       0b00010000,
-                                       0b00100000,
-                                       0b01000000,
-                                       0b10000000,
-                                       0b00000001,
-                                       0b00000010,
-                                       0b00000100,
-                                       0b00001000,
-                                       0b00010000,
-                                       0b00100000,
-                                       0b01000000,
-                                       0b10000000,
-                                       0b00000001,
-                                       0b00000010,
-                                       0b00000100,
-                                       0b00001000,
-                                       0b00010000,
-                                       0b00100000,
-                                       0b01000000,
-                                       0b10000000);
+				       0b00000010,
+				       0b00000100,
+				       0b00001000,
+				       0b00010000,
+				       0b00100000,
+				       0b01000000,
+				       0b10000000,
+				       0b00000001,
+				       0b00000010,
+				       0b00000100,
+				       0b00001000,
+				       0b00010000,
+				       0b00100000,
+				       0b01000000,
+				       0b10000000,
+				       0b00000001,
+				       0b00000010,
+				       0b00000100,
+				       0b00001000,
+				       0b00010000,
+				       0b00100000,
+				       0b01000000,
+				       0b10000000,
+				       0b00000001,
+				       0b00000010,
+				       0b00000100,
+				       0b00001000,
+				       0b00010000,
+				       0b00100000,
+				       0b01000000,
+				       0b10000000);
 #endif
 #elif defined(__arm__)
   uint8x16_t *i_128=(uint8x16_t *)input, *o_128=(uint8x16_t *)expandInput;
@@ -190,41 +196,40 @@ char interleave_compact_byte(short *base_interleaver,unsigned char *input, unsig
   uint16x8_t tmp3;
   uint32x4_t tmp4;
   uint8x16_t and_tmp;
-  uint8x16_t BIT_MASK = {       0b10000000,
-                                0b01000000,
-                                0b00100000,
-                                0b00010000,
-                                0b00001000,
-                                0b00000100,
-                                0b00000010,
-                                0b00000001,
-                                0b10000000,
-                                0b01000000,
-                                0b00100000,
-                                0b00010000,
-                                0b00001000,
-                                0b00000100,
-                                0b00000010,
-                                0b00000001
-                        };
+  uint8x16_t BIT_MASK = {  	    0b10000000,
+                                    0b01000000,
+                                    0b00100000,
+                                    0b00010000,
+                                    0b00001000,
+                                    0b00000100,
+                                    0b00000010,
+                                    0b00000001,
+                                    0b10000000,
+                                    0b01000000,
+                                    0b00100000,
+                                    0b00010000,
+                                    0b00001000,
+                                    0b00000100,
+                                    0b00000010,
+                                    0b00000001};
 #endif
-#ifndef __AVX2__
+ 
 
+#ifndef __AVX2__
   if ((n&15) > 0)
     loop++;
-
 #else
   loop=n>>5;
-
   if ((n&31) > 0)
     loop++;
-
 #endif
 
+
   for (i=0; i<loop ; i++ ) {
-    // int cur_byte=i<<3;
-    // for (b=0;b<8;b++)
-    //   expandInput[cur_byte+b] = (input[i]&(1<<(7-b)))>>(7-b);
+    // int cur_byte=i<<3; 
+    // for (b=0;b<8;b++) 
+    //   expandInput[cur_byte+b] = (input[i]&(1<<(7-b)))>>(7-b); 
+
 #if defined(__x86_64__) || defined(__i386__)
 #ifndef __AVX2__
     tmp1=_mm_load_si128(i_128++);       // tmp1 = B0,B1,...,B15
@@ -232,22 +237,29 @@ char interleave_compact_byte(short *base_interleaver,unsigned char *input, unsig
     tmp3=_mm_unpacklo_epi16(tmp2,tmp2); // tmp3 = B0,B0,B0,B0,B1,B1,B1,B1,B2,B2,B2,B2,B3,B3,B3,B3
     tmp4=_mm_unpacklo_epi32(tmp3,tmp3); // tmp4 - B0,B0,B0,B0,B0,B0,B0,B0,B1,B1,B1,B1,B1,B1,B1,B1
     *o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);
+
     tmp4=_mm_unpackhi_epi32(tmp3,tmp3); // tmp4 - B2,B2,B2,B2,B2,B2,B2,B2,B3,B3,B3,B3,B3,B3,B3,B3
     *o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
+
     tmp3=_mm_unpackhi_epi16(tmp2,tmp2); // tmp3 = B4,B4,B4,B4,B5,B5,B5,B5,B6,B6,B6,B6,B7,B7,B7,B7
     tmp4=_mm_unpacklo_epi32(tmp3,tmp3); // tmp4 - B4,B4,B4,B4,B4,B4,B4,B4,B5,B5,B5,B5,B5,B5,B5,B5
     *o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
+
     tmp4=_mm_unpackhi_epi32(tmp3,tmp3); // tmp4 - B6,B6,B6,B6,B6,B6,B6,B6,B7,B7,B7,B7,B7,B7,B7,B7
     *o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
+
     tmp2=_mm_unpackhi_epi8(tmp1,tmp1);  // tmp2 = B8,B8,B9,B9,...,B15,B15
     tmp3=_mm_unpacklo_epi16(tmp2,tmp2); // tmp3 = B8,B8,B8,B8,B9,B9,B9,B9,B10,B10,B10,B10,B11,B11,B11,B11
     tmp4=_mm_unpacklo_epi32(tmp3,tmp3); // tmp4 = B8,B8,B8,B8,B8,B8,B8,B8,B9,B9,B9,B9,B9,B9,B9,B9
     *o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
+
     tmp4=_mm_unpackhi_epi32(tmp3,tmp3); // tmp4 = B10,B10,B10,B10,B10,B10,B10,B10,B11,B11,B11,B11,B11,B11,B11,B11
     *o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
+
     tmp3=_mm_unpackhi_epi16(tmp2,tmp2); // tmp3 = B12,B12,B12,B12,B13,B13,B13,B13,B14,B14,B14,B14,B15,B15,B15,B15
     tmp4=_mm_unpacklo_epi32(tmp3,tmp3); // tmp4 = B12,B12,B12,B12,B12,B12,B12,B12,B13,B13,B13,B13,B13,B13,B13,B13
     *o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
+
     tmp4=_mm_unpackhi_epi32(tmp3,tmp3); // tmp4 = B14,B14,B14,B14,B14,B14,B14,B14,B15,B15,B15,B15,B15,B15,B15,B15
     *o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
 #else
@@ -269,6 +281,7 @@ char interleave_compact_byte(short *base_interleaver,unsigned char *input, unsig
     //print_bytes2("out",(uint8_t*)o_256);
     o_256[4]=_mm256_cmpeq_epi8(_mm256_and_si256(tmp7,BIT_MASK),BIT_MASK);;
     //print_bytes2("out",(uint8_t*)(o_256+4));
+
     tmp3=_mm256_unpackhi_epi16(tmp2,tmp2); // tmp3 = B4,B4,B4,B4,B5,B5,B5,B5,B6,B6,B6,B6,B7,B7,B7,B7,B20,B20,B20,B20,...,B23,B23,B23,B23
     tmp4=_mm256_unpacklo_epi32(tmp3,tmp3); // tmp4 - B4,B4,B4,B4,B4,B4,B4,B4,B5,B5,B5,B5,B5,B5,B5,B5,B20,B20...,B21..,B21
     tmp5=_mm256_unpackhi_epi32(tmp3,tmp3); // tmp5 - B6,B6,B6,B6,B6,B6,B6,B6,B7,B7,B7,B7,B7,B7,B7,B7,B22...,B22,B23,...,B23
@@ -284,6 +297,7 @@ char interleave_compact_byte(short *base_interleaver,unsigned char *input, unsig
     //print_bytes2("out",(uint8_t*)(o_256+1));
     o_256[5]=_mm256_cmpeq_epi8(_mm256_and_si256(tmp7,BIT_MASK),BIT_MASK);;
     //print_bytes2("out",(uint8_t*)(o_256+4));
+
     tmp2=_mm256_unpackhi_epi8(tmp1,tmp1);  // tmp2 = B8 B9 B10 B11 B12 B13 B14 B15 B25 B26 B27 B28 B29 B30 B31
     tmp3=_mm256_unpacklo_epi16(tmp2,tmp2); // tmp3 = B8,B9,B10,B11,B26,B27,B28,B29
     tmp4=_mm256_unpacklo_epi32(tmp3,tmp3); // tmp4 - B8,B9,B26,B27
@@ -300,10 +314,11 @@ char interleave_compact_byte(short *base_interleaver,unsigned char *input, unsig
     //print_bytes2("out",(uint8_t*)(o_256+2));
     o_256[6]=_mm256_cmpeq_epi8(_mm256_and_si256(tmp7,BIT_MASK),BIT_MASK);;
     //print_bytes2("out",(uint8_t*)(o_256+4));
+
     tmp3=_mm256_unpackhi_epi16(tmp2,tmp2); // tmp3 = B12 B13 B14 B15 B28 B29 B30 B31
     tmp4=_mm256_unpacklo_epi32(tmp3,tmp3); // tmp4 = B12 B13 B28 B29
-    tmp5=_mm256_unpackhi_epi32(tmp3,tmp3); // tmp5 = B14 B15 B30 B31
-    tmp6=_mm256_insertf128_si256(tmp4,_mm256_extracti128_si256(tmp5,0),1);  // tmp6 = B12 B13 B14 B15
+    tmp5=_mm256_unpackhi_epi32(tmp3,tmp3); // tmp5 = B14 B15 B30 B31 
+    tmp6=_mm256_insertf128_si256(tmp4,_mm256_extracti128_si256(tmp5,0),1);  // tmp6 = B12 B13 B14 B15 
     tmp7=_mm256_insertf128_si256(tmp5,_mm256_extracti128_si256(tmp4,1),0);  // tmp7 = B28 B29 B30 B31
     //print_bytes2("tmp2",(uint8_t*)&tmp2);
     //print_bytes2("tmp3",(uint8_t*)&tmp3);
@@ -315,35 +330,48 @@ char interleave_compact_byte(short *base_interleaver,unsigned char *input, unsig
     //print_bytes2("out",(uint8_t*)(o_256+3));
     o_256[7]=_mm256_cmpeq_epi8(_mm256_and_si256(tmp7,BIT_MASK),BIT_MASK);;
     //print_bytes2("out",(uint8_t*)(o_256+7));
+
     o_256+=8;
 #endif
 #elif defined(__arm__)
-    tmp1=vld1q_u8((uint8_t *)i_128);
+    tmp1=vld1q_u8((uint8_t*)i_128);
     //print_bytes("tmp1:",(uint8_t*)&tmp1);
+
     uint8x16x2_t temp1 =  vzipq_u8(tmp1,tmp1);
     tmp2 = temp1.val[0];
+
     uint16x8x2_t temp2 =  vzipq_u16((uint16x8_t)tmp2,(uint16x8_t)tmp2);
     tmp3 = temp2.val[0];
+
     uint32x4x2_t temp3 =  vzipq_u32((uint32x4_t)tmp3,(uint32x4_t)tmp3);
     tmp4 = temp3.val[0];
     //print_bytes("tmp4:",(uint8_t*)&tmp4);
+
     *o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK);    //1
     //print_bytes("o:",(uint8_t*)(o_128-1));
+
     tmp4 = temp3.val[1];
     //print_bytes("tmp4:",(uint8_t*)&tmp4);
+
     *o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK);    //2
     //print_bytes("o:",(uint8_t*)(o_128-1));
+
     tmp3 = temp2.val[1];
     temp3 =  vzipq_u32((uint32x4_t)tmp3,(uint32x4_t)tmp3);
     tmp4 = temp3.val[0];
     //print_bytes("tmp4:",(uint8_t*)&tmp4);
+
     *o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK);    //3
     //print_bytes("o:",(uint8_t*)(o_128-1));
+
     tmp4 = temp3.val[1];
     //print_bytes("tmp4:",(uint8_t*)&tmp4);
+
     *o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK);    //4
-    //and_tmp = vandq_u8((uint8x16_t)tmp4,BIT_MASK); print_bytes("and:",and_tmp);
+    //and_tmp = vandq_u8((uint8x16_t)tmp4,BIT_MASK); print_bytes("and:",and_tmp); 
     //print_bytes("o:",(uint8_t*)(o_128-1));
+
+
     temp1 =  vzipq_u8(tmp1,tmp1);
     tmp2 = temp1.val[1];
     temp2 =  vzipq_u16((uint16x8_t)tmp2,(uint16x8_t)tmp2);
@@ -351,41 +379,52 @@ char interleave_compact_byte(short *base_interleaver,unsigned char *input, unsig
     temp3 =  vzipq_u32((uint32x4_t)tmp3,(uint32x4_t)tmp3);
     tmp4 = temp3.val[0];
     //print_bytes("tmp4:",(uint8_t*)&tmp4);
+
     *o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK);    //5
     //print_bytes("o:",(uint8_t*)(o_128-1));
+
     tmp4 = temp3.val[1];
     //print_bytes("tmp4:",(uint8_t*)&tmp4);
+
     *o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK);    //6
     //print_bytes("o:",(uint8_t*)(o_128-1));
+
+
     temp2 =  vzipq_u16((uint16x8_t)tmp2,(uint16x8_t)tmp2);
     tmp3 = temp2.val[1];
     temp3 =  vzipq_u32((uint32x4_t)tmp3,(uint32x4_t)tmp3);
     tmp4 = temp3.val[0];
     //print_bytes("tmp4:",(uint8_t*)&tmp4);
+
     *o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK);    //7
     //print_bytes("o:",(uint8_t*)(o_128-1));
+
     tmp4 = temp3.val[1];
     //print_bytes("tmp4:",(uint8_t*)&tmp4);
+
     *o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK);    //7
     //print_bytes("o:",(uint8_t*)(o_128-1));
+
     i_128++;
 #endif
   }
+  
 
-  short *ptr_intl=base_interleaver;
+  short * ptr_intl=base_interleaver;
 #if defined(__x86_64) || defined(__i386__)
 #ifndef __AVX2__
   __m128i tmp;
-  uint16_t *systematic2_ptr=(uint16_t *) output;
+ uint16_t *systematic2_ptr=(uint16_t *) output;
 #else
   __m256i tmp;
-  uint32_t *systematic2_ptr=(uint32_t *) output;
+ uint32_t *systematic2_ptr=(uint32_t *) output;
 #endif
 #elif defined(__arm__)
   uint8x16_t tmp;
-  const uint8_t __attribute__ ((aligned (16))) _Powers[16]=
-  { 1, 2, 4, 8, 16, 32, 64, 128, 1, 2, 4, 8, 16, 32, 64, 128 };
-  // Set the powers of 2 (do it once for all, if applicable)
+  const uint8_t __attribute__ ((aligned (16))) _Powers[16]= 
+    { 1, 2, 4, 8, 16, 32, 64, 128, 1, 2, 4, 8, 16, 32, 64, 128 };
+
+// Set the powers of 2 (do it once for all, if applicable)
   uint8x16_t Powers= vld1q_u8(_Powers);
   uint8_t *systematic2_ptr=(uint8_t *) output;
 #endif
@@ -396,6 +435,8 @@ char interleave_compact_byte(short *base_interleaver,unsigned char *input, unsig
 #endif
 
   for ( i=0; i<  input_length_words ; i ++ ) {
+
+
 #if defined(__x86_64__) || defined(__i386__)
 #ifndef __AVX2__
     tmp=_mm_insert_epi8(tmp,expandInput[*ptr_intl++],7);
@@ -424,6 +465,7 @@ char interleave_compact_byte(short *base_interleaver,unsigned char *input, unsig
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],2);
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],1);
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],0);
+
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],8+7);
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],8+6);
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],8+5);
@@ -432,6 +474,7 @@ char interleave_compact_byte(short *base_interleaver,unsigned char *input, unsig
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],8+2);
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],8+1);
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],8+0);
+
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],16+7);
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],16+6);
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],16+5);
@@ -440,6 +483,7 @@ char interleave_compact_byte(short *base_interleaver,unsigned char *input, unsig
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],16+2);
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],16+1);
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],16+0);
+
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],24+7);
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],24+6);
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],24+5);
@@ -448,6 +492,7 @@ char interleave_compact_byte(short *base_interleaver,unsigned char *input, unsig
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],24+2);
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],24+1);
     tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],24+0);
+
     *systematic2_ptr++=(unsigned int)_mm256_movemask_epi8(tmp);
 #endif
 #elif defined(__arm__)
@@ -467,10 +512,11 @@ char interleave_compact_byte(short *base_interleaver,unsigned char *input, unsig
     tmp=vsetq_lane_u8(expandInput[*ptr_intl++],tmp,8+2);
     tmp=vsetq_lane_u8(expandInput[*ptr_intl++],tmp,8+1);
     tmp=vsetq_lane_u8(expandInput[*ptr_intl++],tmp,8+0);
-    // Compute the mask from the input
+// Compute the mask from the input
     uint64x2_t Mask= vpaddlq_u32(vpaddlq_u16(vpaddlq_u8(vandq_u8(tmp, Powers))));
     vst1q_lane_u8(systematic2_ptr++, (uint8x16_t)Mask, 0);
     vst1q_lane_u8(systematic2_ptr++, (uint8x16_t)Mask, 8);
+
 #endif
   }
 
@@ -491,12 +537,14 @@ char interleave_compact_byte(short *base_interleaver,unsigned char *input, unsig
 void threegpplte_turbo_encoder_sse(unsigned char *input,
                                    unsigned short input_length_bytes,
                                    unsigned char *output,
-                                   unsigned char F) {
+                                   unsigned char F)
+{
+
   int i;
   unsigned char *x;
   unsigned char state0=0,state1=0;
   unsigned short input_length_bits = input_length_bytes<<3;
-  short *base_interleaver;
+  short * base_interleaver;
 
   if (  all_treillis_initialized == 0 ) {
     treillis_table_init();
@@ -512,12 +560,15 @@ void threegpplte_turbo_encoder_sse(unsigned char *input,
     base_interleaver=il_tb+f1f2mat[i].beg_index;
   }
 
+
   unsigned char systematic2[768] __attribute__((aligned(32)));
+
   interleave_compact_byte(base_interleaver,input,systematic2,input_length_bytes);
+
 #if defined(__x86_64__) || defined(__i386__)
-  __m64 *ptr_output=(__m64 *) output;
+  __m64 *ptr_output=(__m64*) output;
 #elif defined(__arm__)
-  uint8x8_t *ptr_output=(uint8x8_t *)output;
+  uint8x8_t *ptr_output=(uint8x8_t*)output; 
 #endif
   unsigned char cur_s1, cur_s2;
   int code_rate;
@@ -531,45 +582,54 @@ void threegpplte_turbo_encoder_sse(unsigned char *input,
       /*
        *ptr_output++ = _mm_add_pi8(all_treillis[state0][cur_s1].systematic_64[code_rate],
        _mm_add_pi8(all_treillis[state0][cur_s1].parity1_64[code_rate],
-      all_treillis[state1][cur_s2].parity2_64[code_rate]));
-      */
-      *ptr_output++ = _mm_add_pi8(all_treillis[state0][cur_s1].systematic_andp1_64[code_rate],
-                                  all_treillis[state1][cur_s2].parity2_64[code_rate]);
-#elif defined(__arm__)
-      *ptr_output++ = vadd_u8(all_treillis[state0][cur_s1].systematic_andp1_64[code_rate],
-                              all_treillis[state0][cur_s1].parity2_64[code_rate]);
-#endif
-    }
+	 all_treillis[state1][cur_s2].parity2_64[code_rate]));
+	*/
 
-    state0=all_treillis[state0][cur_s1].exit_state;
-    state1=all_treillis[state1][cur_s2].exit_state;
+      *ptr_output++ = _mm_add_pi8(all_treillis[state0][cur_s1].systematic_andp1_64[code_rate],
+				  all_treillis[state1][cur_s2].parity2_64[code_rate]);
+	
+	
+#elif defined(__arm__)
+	*ptr_output++ = vadd_u8(all_treillis[state0][cur_s1].systematic_andp1_64[code_rate],
+				all_treillis[state0][cur_s1].parity2_64[code_rate]);
+#endif
+      }
+      
+      state0=all_treillis[state0][cur_s1].exit_state;
+      state1=all_treillis[state1][cur_s2].exit_state;
   }
 
   x=output+(input_length_bits*3);
+
   // Trellis termination
   threegpplte_rsc_termination(&x[0],&x[1],&state0);
 #ifdef DEBUG_TURBO_ENCODER
-  printf("term: x0 %u, x1 %u, state0 %d\n",x[0],x[1],state0);
+  printf("term: x0 %d, x1 %d, state0 %d\n",x[0],x[1],state0);
 #endif //DEBUG_TURBO_ENCODER
+
   threegpplte_rsc_termination(&x[2],&x[3],&state0);
 #ifdef DEBUG_TURBO_ENCODER
-  printf("term: x0 %u, x1 %u, state0 %d\n",x[2],x[3],state0);
+  printf("term: x0 %d, x1 %d, state0 %d\n",x[2],x[3],state0);
 #endif //DEBUG_TURBO_ENCODER
+
   threegpplte_rsc_termination(&x[4],&x[5],&state0);
 #ifdef DEBUG_TURBO_ENCODER
-  printf("term: x0 %u, x1 %u, state0 %d\n",x[4],x[5],state0);
+  printf("term: x0 %d, x1 %d, state0 %d\n",x[4],x[5],state0);
 #endif //DEBUG_TURBO_ENCODER
+
   threegpplte_rsc_termination(&x[6],&x[7],&state1);
+
 #ifdef DEBUG_TURBO_ENCODER
-  printf("term: x0 %u, x1 %u, state1 %d\n",x[6],x[7],state1);
+  printf("term: x0 %d, x1 %d, state1 %d\n",x[6],x[7],state1);
 #endif //DEBUG_TURBO_ENCODER
   threegpplte_rsc_termination(&x[8],&x[9],&state1);
 #ifdef DEBUG_TURBO_ENCODER
-  printf("term: x0 %u, x1 %u, state1 %d\n",x[8],x[9],state1);
+  printf("term: x0 %d, x1 %d, state1 %d\n",x[8],x[9],state1);
 #endif //DEBUG_TURBO_ENCODER
   threegpplte_rsc_termination(&x[10],&x[11],&state1);
+
 #ifdef DEBUG_TURBO_ENCODER
-  printf("term: x0 %u, x1 %u, state1 %d\n",x[10],x[11],state1);
+  printf("term: x0 %d, x1 %d, state1 %d\n",x[10],x[11],state1);
 #endif //DEBUG_TURBO_ENCODER
 #if defined(__x86_64__) || defined(__i386__)
   _mm_empty();
@@ -578,31 +638,32 @@ void threegpplte_turbo_encoder_sse(unsigned char *input,
 }
 
 void init_encoder_sse (void) {
-  treillis_table_init();
+    treillis_table_init(); 	   
 }
 /* function which will be called by the shared lib loader, to check shared lib version
    against main exec version. version mismatch no considered as fatal (interfaces not supposed to change)
-*/
-int  coding_checkbuildver(char *mainexec_buildversion, char **shlib_buildversion) {
+*/ 
+int  coding_checkbuildver(char * mainexec_buildversion, char ** shlib_buildversion)
+{
 #ifndef PACKAGE_VERSION
 #define PACKAGE_VERSION "standalone built: " __DATE__ __TIME__
 #endif
-  *shlib_buildversion = PACKAGE_VERSION;
-
-  if (strcmp(mainexec_buildversion, *shlib_buildversion) != 0) {
-    fprintf(stderr,"[CODING] shared lib version %s, doesn't match main version %s, compatibility should be checked\n",
-            mainexec_buildversion,*shlib_buildversion);
-  }
-
-  return 0;
+    *shlib_buildversion = PACKAGE_VERSION;
+    if (strcmp(mainexec_buildversion, *shlib_buildversion) != 0) {
+          fprintf(stderr,"[CODING] shared lib version %s, doesn't match main version %s, compatibility should be checked\n",
+                mainexec_buildversion,*shlib_buildversion);
+    }
+    return 0;
 }
 
 #ifdef TC_MAIN
-#define INPUT_LENGTH 20
+#define INPUT_LENGTH 20 
 #define F1 21
 #define F2 120
 
-int main(int argc,char **argv) {
+int main(int argc,char **argv)
+{
+
   unsigned char input[INPUT_LENGTH+32],state,state2;
   unsigned char output[12+(3*(INPUT_LENGTH<<3))],x,z;
   int i;
@@ -619,27 +680,28 @@ int main(int argc,char **argv) {
   printf("\n");
 
   for (state=0; state<8; state++) {
+
     state2=state;
     threegpplte_rsc_termination(&x,&z,&state2);
     printf("Termination: (%d->%d) : (%d,%d)\n",state,state2,x,z);
   }
 
-  memset((void *)input,0,INPUT_LENGTH+16);
-
+  memset((void*)input,0,INPUT_LENGTH+16);
   for (i=0; i<INPUT_LENGTH; i++) {
     input[i] = i*219;
-    printf("Input %d : %u\n",i,input[i]);
+    printf("Input %d : %d\n",i,input[i]);
   }
 
   threegpplte_turbo_encoder_sse(&input[0],
-                                INPUT_LENGTH,
-                                &output[0],
-                                0);
+                            INPUT_LENGTH,
+                            &output[0],
+                            0);
 
-  for (i=0; i<12+(INPUT_LENGTH*24); i++)
-    printf("%u",output[i]);
 
+  for (i=0;i<12+(INPUT_LENGTH*24);i++)
+    printf("%d",output[i]);
   printf("\n");
+
   return(0);
 }