Merge pull request #324 from shilpa24balaji/3.12_p3b

Update retry time in connection-health-file
2026-01-27 18:20:04 +00:00 · 2019-10-25 11:49:25 -07:00
70 changed files with 532 additions and 4651 deletions
--- a/.github/scripts/get_sonarcloud.sh
+++ b/.github/scripts/get_sonarcloud.sh
@@ -1,24 +0,0 @@
-#!/bin/bash
-# SPDX-FileCopyrightText: 2021 Comcast Cable Communications Management, LLC
-# SPDX-License-Identifier: Apache-2.0
-
-curl -s -L -O https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip
-unzip -q -o build-wrapper-linux-x86.zip
-
-
-SONAR_VERSION=`curl -s https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ |grep -o "sonar-scanner-cli-[0-9.]*-linux.zip"|sort -r|uniq|head -n 1`
-curl -s -L -O https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/$SONAR_VERSION
-curl -s -L -O https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/$SONAR_VERSION.sha256
-echo "  $SONAR_VERSION" >> $SONAR_VERSION.sha256
-sha256sum -c $SONAR_VERSION.sha256
-if [[ $? -ne 0 ]]
-then
-    exit 1
-fi
-unzip -q $SONAR_VERSION
-
-output=`ls | grep -o "sonar-scanner-[0-9.]*-linux"`
-
-echo "Using $output"
-
-mv $output sonar-scanner
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,50 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Comcast Cable Communications Management, LLC
-# SPDX-License-Identifier: Apache-2.0
-
-name: LGTM Analysis
-
-on:
-  create:
-  pull_request:
-  push:
-    branches:
-      - main
-  schedule:
-    - cron: '12 9 * * 3'
-
-jobs:
-  codeql:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      # Install the dependent packages
-    - name: Install packages
-      run: |
-        sudo apt update
-        sudo apt-get -y install valgrind libcunit1 libcunit1-doc libcunit1-dev libmsgpack-dev gcovr libtool
- 
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: cpp
-        queries: security-extended
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -1,72 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Comcast Cable Communications Management, LLC
-# SPDX-License-Identifier: Apache-2.0
-
-name: CI
-
-on:
-  pull_request:
-  push:
-    paths-ignore:
-      - 'AUTHORS'
-      - 'LICENSE'
-      - 'NOTICE'
-      - '**.md'
-      - '.gitignore'
-    tags-ignore:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
-    branches:
-      - main
-      - master
-
-jobs:
-  test:
-    name: Unit Tests
-    runs-on: [ ubuntu-latest ]
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      # Install the dependent packages
-      - name: Install packages
-        run: |
-          sudo apt update
-          sudo apt-get -y install valgrind libcunit1 libcunit1-doc libcunit1-dev libmsgpack-dev gcovr libtool
-          pip install codecov
-
-      - name: Make Build Directory
-        run: mkdir build
-
-      - name: Get Sonarcloud Binaries
-        uses: xmidt-org/sonarcloud-installer-action@v1
-        with:
-          working-directory: build
-
-      - name: CMake
-        working-directory: build
-        run: |
-          cmake .. -DINTEGRATION_TESTING:BOOL=false -DDISABLE_VALGRIND:BOOL=${DISABLE_VALGRIND} -DENABLE_SESHAT:BOOL=true -DFEATURE_DNS_QUERY:BOOL=true
-
-
-      - name: Build
-        working-directory: build
-        run: |
-          build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-output make all test
-
-      - name: Merge GCOV Reports for Sonarcloud
-        working-directory: build
-        run: |
-          gcovr --sonarqube coverage.xml -r ..
-
-      - name: Upload SonarCloud
-        run: |
-          build/sonar-scanner/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io -Dproject.settings=.sonar-project.properties -Dsonar.login=${{ secrets.SONAR_TOKEN }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Upload Codecov.io
-        uses: codecov/codecov-action@v1
-        with:
-          directory: .
-          fail_ci_if_error: true
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,49 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Comcast Cable Communications Management, LLC
-# SPDX-License-Identifier: Apache-2.0
-
-name: release
-
-on:
-  push:
-    tags:
-      # Push events to matching v#.#.#*, ex: v1.2.3, v.2.4.6-beta
-      - 'v[0-9]+.[0-9]+.[0-9]+*'
-
-jobs:
-  release:
-    runs-on: [ ubuntu-latest ]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Determine repo name
-        run: |
-          echo "repo_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
-          echo "version=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
-          echo "release_slug=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')-${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
-        shell: bash
-      - name: Create tarball and sha256
-        run: |
-          git archive --format=tar.gz -o ${release_slug}.tar.gz --prefix=${release_slug}/ ${version}
-          git archive --format=zip -o ${release_slug}.zip --prefix=${release_slug}/ ${version}
-          sha256sum ${release_slug}.tar.gz ${release_slug}.zip > ${release_slug}-sha256sums.txt
-          mkdir artifacts
-          cp ${release_slug}* artifacts/.
-      - name: Prepare Release Body
-        id: prep
-        run: |
-          export version=${GITHUB_REF#refs/tags/}
-          export NOTES=$(cat CHANGELOG.md | perl -0777 -ne 'print "$1\n" if /.*## \[${version}\]\s(.*?)\s+## \[(v\d+.\d+.\d+)\].*/s')
-          export TODAY=`date +'%m/%d/%Y'`
-          echo ::set-output name=rname::$(echo ${version} ${TODAY})
-          echo ::set-output name=body::${NOTES}
-      - name: create release
-        id: create_release
-        uses: ncipollo/release-action@v1
-        with:
-          name: ${{ steps.prep.outputs.rname }}
-          draft: false
-          prerelease: false
-          bodyFile: ${{ steps.prep.outputs.body }}
-          artifacts: "artifacts/*"
-          token: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
--- a/.github/workflows/tag.yml
+++ b/.github/workflows/tag.yml
@@ -1,33 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Comcast Cable Communications Management, LLC
-# SPDX-License-Identifier: Apache-2.0
-
-name: tag
-
-on:
-  push:
-    paths:
-      - "CHANGELOG.md" # only try to tag if the CHANGELOG has been updated.
-    branches:
-      - main
-
-jobs:
-  build:
-    runs-on: [ ubuntu-latest ]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          token: '${{ secrets.PERSONAL_ACCESS_TOKEN }}'
-          fetch-depth: 0
-      - name: set up bot
-        run: |
-          git config --global user.name "xmidt-bot"
-          git config --global user.email "$BOT_EMAIL"
-      - name: export variables and tag commit
-        run: |
-          export OLD_VERSION=$(git describe --tags `git rev-list --tags --max-count=1` | tail -1)
-          export TAG=$(cat CHANGELOG.md | perl -0777 -ne 'print "$1" if /.*## \[Unreleased\]\s+## \[(v\d+.\d+.\d+)\].*/s')
-          export BINVER=$(cat CMakeLists.txt | perl -0777 -ne 'print "v$1" if /.*project\s*\(.*\s*VERSION\s*(\d+.\d+.\d+).*\s*\)/s')
-          export TODAY=`date +'%m/%d/%Y'`
-          export NOTES=$(cat CHANGELOG.md | perl -0777 -ne 'print "$ENV{TODAY}\n\n$1\n" if /.*## \[$ENV{TAG}\]\s(.*?)\s+## \[(v\d+.\d+.\d+)\].*/s')
-          if [[ "$TAG" != "" && "$TAG" != "$BINVER" ]]; then echo "CHANGELOG.md($TAG) and CMakeLists.txt VERSION($BINVER) do not match"; fi
-          if [[ "$TAG" != "" && "$TAG" != "$OLD_VERSION" && "$TAG" == "$BINVER" ]]; then git tag -a "$TAG" -m "$NOTES"; git push origin --tags; echo $?; fi
--- a/.gitignore
+++ b/.gitignore
@@ -34,5 +34,3 @@
 tags

 build/
-
-tests/jwt_key.tst
--- a/.sonar-project.properties
+++ b/.sonar-project.properties
@@ -1,34 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Comcast Cable Communications Management, LLC
-# SPDX-License-Identifier: Apache-2.0
-
-# Reference:
-# https://github.com/SonarSource/sonarcloud_example_go-sqscanner-travis/blob/master/sonar-project.properties
-
-
-# =====================================================
-#   Standard properties
-# =====================================================
-
-sonar.organization=xmidt-org
-sonar.projectKey=xmidt-org_parodus
-sonar.projectName=parodus
-
-sonar.sources=src
-
-# =====================================================
-#   Meta-data for the project
-# =====================================================
-
-sonar.links.homepage=https://github.com/xmidt-org/parodus
-sonar.links.ci=https://github.com/xmidt-org/parodus/actions
-sonar.links.scm=https://github.com/xmidt-org/parodus
-sonar.links.issue=https://github.com/xmidt-org/parodus/issues
-
-# =====================================================
-#   Properties specific to C
-# =====================================================
-sonar.cfamily.build-wrapper-output=build/bw-output
-sonar.cfamily.threads=2
-sonar.cfamily.cache.enabled=false
-sonar.coverageReportPaths=build/coverage.xml
-
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,43 @@
+dist: trusty
+sudo: required
+
+language: c
+compiler:
+    - gcc
+
+addons:
+  coverity_scan:
+    project:
+      name: "Comcast/parodus"
+      description: "C implementation of the WebPA client coordinator"
+    notification_email: weston_schmidt@alumni.purdue.edu
+    build_command_prepend: "mkdir coverity_build && cd coverity_build && cmake .."
+    build_command:   "make"
+    branch_pattern: ignore
+    
+before_install:
+    - sudo pip install codecov
+    - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
+
+install:
+    - sudo apt-get update -qq
+    - sudo apt-get install -y -qq check libcunit1 libcunit1-dev uuid-dev valgrind
+
+script:
+    - mkdir build
+    - cd build
+    - cmake .. -DINTEGRATION_TESTING:BOOL=false -DDISABLE_VALGRIND:BOOL=false -DENABLE_SESHAT:BOOL=true -DFEATURE_DNS_QUERY:BOOL=true
+    - make
+    - export ARGS="-V"
+    - make test
+
+after_success:
+    - codecov
+
+env:
+    global:
+        - secure: EwQu1WDUgIF5qM5tnKj/+NCPz9t15y289bbqFo0wDhyfTlJGS9buQeJNeVLtNJBEOngpo+AkaPGvh/d9NZ0vLdxu+K/e+HhA6kOTxUrCHD8+4oX9XpVs/XvQmD1COlJYeeqd8bJMKtlFtonGdMJogxpEFQzv4fQjmoARvL2ciV4OB0MBcD5Lsb72L3a0aJT69F6WFuDpgGj2eIQyCDSTPNIi2X7EA8R33lxnntFDn8Vj6qSBbVOI2S5R5S+JUCMp1Q1ZbEqmh6j+wKtszWj8wGqfz8Ol5+GYl511bExb+hwvV5zen0Ol0+2LQmSpYhbQZ7prfI8AclLLwhDUrP+WDOv34vwd4EWQ1OoLqG23HbBygCxPSBIB6ZxPtVkzjVlOK8qqIB5QXqCyq8sPKlrXfntOQ+Ha938cIA+A0ag+26MLbhDGj8k3Os7BdY/oqNTKADZQdxfGKhCiA9qO2clpMyRXoE0q6hv9dYoG/2c4sxH8DKsT8XY/QbGmiBsk0DWHcpxkObCsHUxVKi+gIBGSL/tSjz2IJfQVZkdl2hhcyStGuPKbiwAlW3HydMk0VgRhVmHBIc41Cv7vPdMEVf/XiFhr2utRX468M/LR8vkhhokKl1xkVIiquwCPYPzZVAFARHTlaBMhz9kQVtTAHf2JkHuM9XcLWKW996FiSeswKyI=
+        - secure: LQK36EsQdIJw7eSW1yz+yh3+yJdp8cznynBjE3whOEVI2KHZimr+vtK5hxE6TH0QjYyrb/BFgRql6CtLprpaABSEC9gpqpahu50jiAkjKC8DtfSloAbH5jj+ZllaPjURocerllNLVZxiRM/WCuJAy0nzBpAyx62YmVlEYi+zYD67d3wG6gLwso6l2DWuPPze6t5NmbUmH9hNk52++TZalwMtZFdibQoYm64vCTT5gycujw6ZDa8GD0m+Yryvc20kLlWPOVS9lN1iEGo98/gj8Ops8w0iw6k7SfEkvvFsKEUDr77wAN5Tk4tGq7odVrD/y3W9AsHkkSb1B6RqVWkcW3SjCAQc03jhdaBxXwcoJZcYahY21CB12EP7p0HSjEbvIzNpk0D9MulsGaMPlOudnKdG0/kmD7oIAiXjfC7PiPBBFIc/cVF5VAKNTUInEVfcKvlLpqDatwjB+qgb7pld24dUPuJw+yOgglk7J7xckJYHFTHhk0PWI5oN66dndj3yyJp4dz1v64ViFFTG4PO4YPJydZxRxolg1eGMuG0UIYJK6RWcSQ+ZPBm4p78J8xfHtgUkvWvrHJoXC1qAzqx1XRzbHEeTJgbKgLrWY+B6nbNotw1RDX4lNDirp5EI6GqezoFJToZkqe3MRs8DrqhaFjUbbEzAxznRWmxnWNN3Ujc=
+        # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
+        #   via the "travis encrypt" command using the project repo's public key
+        - secure: "V/W4Z9/3uXpS83CvlZ1XfDAbHPIA2ID5G5s9GPcsUqoOASQdc6Y/DPejUlot+DgtiHOEdTr9n5iWDOuxqjcVnjVd6ag9i2m0PMqDhPj3fnUJM6dAeXIBda/qSuTsJTX4cIwb371R77cLcIUm35IEOSIAQOBCjh7RCf3ivGPUp+wobTonkNzDw6xqO90hx7NLnxwGSCcaNBFKOcLL0e7DXspp18lTWCSSaHELzXOyLlhZnWhC5tiFUIZk1ixm/cO1YEQH9AzgPJ5OYs+On0j8VT8XWMsxHu0zfkZkdZMAEOQbO6u4HBDePIfp+PoF1LwtX/UXfaEkUHZ0kNVXHfsN/KP7NHgTbASe9EXp+R4pcKEy4ZEbx+xpp7FlMQSJYiYiQbJ2FBrjwRPreXiHyCqn8htd0YNOTH4UykvO3NYxlTaMf9aE041lnLjUY18TuXrILz6SzMsGV+nYqfIci/NPuj/57k7nw127a93S4Mr/phXts9ZL8I7kagd8wKv3m5+7rmIfuSfS2kg2pTa0hk5uMqFWLG8AilUQ5t1ChylzPcl/Gdgi9OP0pG2WyUmkqOiSqhwwdg2ZCwptodwuonfbdKMSBuHOS8lLU1bGyCRdWsMoscSv/xn4t3ikzBsSDiKgI8xq2+aqQyHDeVneqAk1BbxiNIwoJeyVXq2EKU6MlgI="
--- a/.whitesource
+++ b/.whitesource
@@ -1,12 +0,0 @@
-{
-  "scanSettings": {
-    "baseBranches": []
-  },
-  "checkRunSettings": {
-    "vulnerableCheckRunConclusionLevel": "failure",
-    "displayMode": "diff"
-  },
-  "issueSettings": {
-    "minSeverityLevel": "LOW"
-  }
-}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,47 +5,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

 ## [Unreleased]
- Add additional HTTP headers for call to Themis from Convey
- Add callback handler for initial cloud connection status change event
- Fix Parodus connection stuck on interface up down received together
- Update to use nopoll version 1.0.3
-
-## [1.1.4]
- on connect retry, requery jwt only if it failed before 
- put two timestamps in connection health file; start conn and current
- change health file update interval to 240sec
- use jitter in backoff delay
- sendMessage to check cloud status == ONLINE before sending
- when killed with SIGTERM, close will use msg in close reason file.
-
-## [1.1.3]
- Add callback handler for ping status change event
- Fixed nopoll_conn_unref crash
- Update retry timestamp in connection-health-file
- fix so that parodus can be killed, even if in a connection fail loop
- provide signal handlers so we shut down properly when INCLUDE_BREAKPAD active
- send status code and reason in websocket close message
- dont try to install handler for signal 9
-
-## [1.1.2]
- Add pause/resume heartBeatTimer
- parodus event handler to listen to interface_down and interface_up event
- Pause connection retry during interface_down event
-
-## [1.1.1]
- Update to use nanomsg v. 1.1.4
- requestNewAuthToken will clear the token if it fails.
- request auth token on every retry, not just after 403
- update to use nopoll v 1.0.2
-
-## [1.0.4]
+- Security: Added support to use auth token during initial connect to cloud
 - Fix re-registration fails that lose a socket
 - Fix mutex error in service alive
 - Security: Mutual Authentication (mTLS or two way TLS)
 - Rename command line options for MTLS cert and Key
-
-## [1.0.3]
- Security: Added support to use auth token during initial connect to cloud
+- Update to use nanomsg v. 1.1.4
+- requestNewAuthToken will clear the token if it fails.
+- request auth token on every retry, not just after 403

 ## [1.0.2] - 2019-02-08
 - Refactored connection.c and updated corresponding unit tests
@@ -95,7 +62,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

 ### Security
 - Added command line arguments for secure token read and acquire.  Token presented to cloud for authentication verification.
- Added support for override functions to support drop root capabilities for parodus process

 ## [1.0.0] - 2017-11-17
 ### Added
@@ -105,13 +71,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Initial creation

-[Unreleased]: https://github.com/Comcast/parodus/compare/1.1.4...HEAD
-[1.1.4]: https://github.com/Comcast/parodus/compare/1.1.3...1.1.4
-[1.1.3]: https://github.com/Comcast/parodus/compare/1.1.2...1.1.3
-[1.1.2]: https://github.com/Comcast/parodus/compare/1.1.1...1.1.2
-[1.1.1]: https://github.com/Comcast/parodus/compare/1.0.4...1.1.1
-[1.0.4]: https://github.com/Comcast/parodus/compare/1.0.3...1.0.4
-[1.0.3]: https://github.com/Comcast/parodus/compare/1.0.2...1.0.3
+[Unreleased]: https://github.com/Comcast/parodus/compare/1.0.1...HEAD
 [1.0.2]: https://github.com/Comcast/parodus/compare/1.0.1...1.0.2
 [1.0.1]: https://github.com/Comcast/parodus/compare/1.0.0...1.0.1
 [1.0.0]: https://github.com/Comcast/parodus/compare/79fa7438de2b14ae64f869d52f5c127497bf9c3f...1.0.0
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,6 @@

 cmake_minimum_required(VERSION 2.8.7)

-#project(parodus VERSION 1.1.15)
 project(parodus)

 include(ExternalProject)
@@ -43,11 +42,6 @@ include_directories(${INCLUDE_DIR}
                    ${INCLUDE_DIR}/cjwt
 					)	

-if (ENABLE_WEBCFGBIN)
-include_directories(${INCLUDE_DIR}/rbus)
-endif (ENABLE_WEBCFGBIN)
-
-
 # Get git commit hash 
 #-------------------------------------------------------------------------------
 execute_process(
@@ -64,18 +58,9 @@ add_definitions("-DGIT_COMMIT_TAG=\"${GIT_COMMIT_TAG}\"")
 add_definitions(-std=c99)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE -DNOPOLL_LOGGER ")

-if (DEVICE_CAMERA)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=all -Wno-missing-field-initializers")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=all")
-add_definitions(-DDEVICE_CAMERA)
-else ()
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=all -Wno-missing-field-initializers")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=all")
-endif (DEVICE_CAMERA)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall -Wno-missing-field-initializers")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall")

-if (INCLUDE_BREAKPAD)
-add_definitions(-DINCLUDE_BREAKPAD)
-endif (INCLUDE_BREAKPAD)

 # pthread external dependency
 #-------------------------------------------------------------------------------
@@ -100,7 +85,7 @@ add_dependencies(libtrower-base64 trower-base64)
 ExternalProject_Add(nopoll
    PREFIX ${PREFIX_DIR}/nopoll
    GIT_REPOSITORY https://github.com/Comcast/nopoll.git
-    GIT_TAG "1.0.3"
+    GIT_TAG "1.0.1"
    CONFIGURE_COMMAND COMMAND <SOURCE_DIR>/autogen.sh --prefix=${PREFIX}
                                                     --includedir=${INCLUDE_DIR}
                                                     --libdir=${LIBRARY_DIR}
@@ -167,7 +152,7 @@ add_dependencies(libcurl curl)
 ExternalProject_Add(cimplog
    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/cimplog
    GIT_REPOSITORY https://github.com/Comcast/cimplog.git
-    GIT_TAG "1.0.2"
+    GIT_TAG "1.0.1"
    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_TESTING=OFF
 )
 add_library(libcimplog STATIC SHARED IMPORTED)
@@ -179,8 +164,8 @@ add_dependencies(libcimplog cimplog)
 ExternalProject_Add(wrp-c
 	DEPENDS trower-base64 msgpack cimplog
    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/wrp-c
-    GIT_REPOSITORY https://github.com/xmidt-org/wrp-c.git
-    GIT_TAG "b5ef4d10cb39905908788bc89ab3e4dab201db8a"
+    GIT_REPOSITORY https://github.com/Comcast/wrp-c.git
+    GIT_TAG "1.0.1"
    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
                  -DMSGPACK_ENABLE_CXX=OFF
                  -DMSGPACK_BUILD_EXAMPLES=OFF
@@ -243,26 +228,6 @@ include_directories(${INCLUDE_DIR}

 endif (FEATURE_DNS_QUERY)

-if (ENABLE_WEBCFGBIN)
-# rbus external dependency
-#-------------------------------------------------------------------------------
-ExternalProject_Add(rbus
-     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/rbus
-     GIT_REPOSITORY https://github.com/rdkcentral/rbus.git
-     GIT_TAG main
-     CMAKE_ARGS += -DBUILD_FOR_DESKTOP=ON -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_TESTING=OFF
-)
-
-add_library(librbuscore STATIC SHARED IMPORTED)
-add_dependencies(librbuscore rbuscore)
-
-add_library(librtMessage STATIC SHARED IMPORTED)
-add_dependencies(librtMessage rtMessage)
-
-add_library(librbus STATIC SHARED IMPORTED)
-add_dependencies(librbus rbus)
-endif (ENABLE_WEBCFGBIN)
-
 if (BUILD_TESTING)
 # cmocka external dependency
 #-------------------------------------------------------------------------------
@@ -287,14 +252,6 @@ if (FEATURE_DNS_QUERY)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFEATURE_DNS_QUERY ")
 endif (FEATURE_DNS_QUERY)

-if (ENABLE_WEBCFGBIN)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_WEBCFGBIN ")
-endif (ENABLE_WEBCFGBIN)
-
-if (WAN_FAILOVER_SUPPORTED)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWAN_FAILOVER_SUPPORTED ")
-endif (WAN_FAILOVER_SUPPORTED)
-
 link_directories ( ${LIBRARY_DIR} ${COMMON_LIBRARY_DIR} ${LIBRARY_DIR64} )
 add_subdirectory(src)
 if (BUILD_TESTING)
--- a/README.md
+++ b/README.md
@@ -1,16 +1,10 @@
-<!--
-SPDX-FileCopyrightText: 2016-2021 Comcast Cable Communications Management, LLC
-SPDX-License-Identifier: Apache-2.0
-->
 # parodus

-[![Build Status](https://github.com/xmidt-org/parodus/workflows/CI/badge.svg)](https://github.com/xmidt-org/parodus/actions)
-[![codecov.io](http://codecov.io/github/xmidt-org/parodus/coverage.svg?branch=master)](http://codecov.io/github/xmidt-org/parodus?branch=master)
+[![Build Status](https://travis-ci.org/Comcast/parodus.svg?branch=master)](https://travis-ci.org/Comcast/parodus)
+[![codecov.io](http://codecov.io/github/Comcast/parodus/coverage.svg?branch=master)](http://codecov.io/github/Comcast/parodus?branch=master)
 [![Coverity](https://img.shields.io/coverity/scan/11192.svg)](https://scan.coverity.com/projects/comcast-parodus)
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xmidt-org_parodus&metric=alert_status)](https://sonarcloud.io/dashboard?id=xmidt-org_parodus)
-[![Language Grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/xmidt-org/parodus.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/xmidt-org/parodus/context:cpp)
-[![Apache V2 License](http://img.shields.io/badge/license-Apache%20V2-blue.svg)](https://github.com/xmidt-org/parodus/blob/master/LICENSE)
-[![GitHub release](https://img.shields.io/github/release/xmidt-org/parodus.svg)](CHANGELOG.md)
+[![Apache V2 License](http://img.shields.io/badge/license-Apache%20V2-blue.svg)](https://github.com/Comcast/parodus/blob/master/LICENSE)
+[![GitHub release](https://img.shields.io/github/release/Comcast/parodus.svg)](CHANGELOG.md)


 C implementation of the XMiDT client coordinator
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,8 +14,8 @@
 set(SOURCES main.c mutex.c networking.c nopoll_helpers.c heartBeat.c nopoll_handlers.c
    ParodusInternal.c string_helpers.c time.c config.c conn_interface.c
    connection.c spin_thread.c client_list.c service_alive.c
-    upstream.c downstream.c thread_tasks.c partners_check.c token.c event_handler.c
-	crud_interface.c crud_tasks.c crud_internal.c close_retry.c auth_token.c privilege.c)
+    upstream.c downstream.c thread_tasks.c partners_check.c token.c 
+	crud_interface.c crud_tasks.c crud_internal.c close_retry.c auth_token.c)

 if (ENABLE_SESHAT)
 set(SOURCES ${SOURCES} seshat_interface.c)
@@ -23,15 +23,6 @@ else()
 set(SOURCES ${SOURCES} seshat_interface_stub.c)
 endif (ENABLE_SESHAT)

-if (ENABLE_WEBCFGBIN)
-set(SOURCES ${SOURCES} upstream_rbus.c xmidtsend_rbus.c)
-endif (ENABLE_WEBCFGBIN)
-
-if (WAN_FAILOVER_SUPPORTED)
-message(STATUS "WAN_FAILOVER_SUPPORTED is supported")
-else()
-message(STATUS "WAN_FAILOVER_SUPPORTED is not supported")
-endif (WAN_FAILOVER_SUPPORTED)

 add_executable(parodus ${SOURCES})

@@ -62,7 +53,5 @@ if (ENABLE_SESHAT)
 target_link_libraries (parodus -llibseshat)
 endif (ENABLE_SESHAT)

-if (ENABLE_WEBCFGBIN)
-target_link_libraries (parodus -lrbus)
-endif (ENABLE_WEBCFGBIN)
+
 install (TARGETS parodus DESTINATION bin)
--- a/src/ParodusInternal.c
+++ b/src/ParodusInternal.c
@@ -25,11 +25,6 @@
 #include "config.h"
 #include "connection.h"

-bool interface_down_event = false;
-
-pthread_mutex_t interface_down_mut=PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t interface_down_con=PTHREAD_COND_INITIALIZER;
-
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
@@ -69,9 +64,9 @@ char* getWebpaConveyHeader()
        cJSON_AddStringToObject(response, WEBPA_PROTOCOL, get_parodus_cfg()->webpa_protocol);
    }

-    if(strlen(getWebpaInterface())!=0)
+    if(strlen(get_parodus_cfg()->webpa_interface_used)!=0)
    {
-	    cJSON_AddStringToObject(response, WEBPA_INTERFACE, getWebpaInterface());
+	    cJSON_AddStringToObject(response, WEBPA_INTERFACE, get_parodus_cfg()->webpa_interface_used);
    }	

    if(strlen(get_parodus_cfg()->hw_last_reboot_reason)!=0)
@@ -131,27 +126,6 @@ char* getWebpaConveyHeader()
    return NULL;
 }

-int readFromFile(const char *file_name, char **data)
-{
-	FILE *fp;
-	int ch_count = 0;
-	fp = fopen(file_name, "r+");
-	if (fp == NULL)
-	{
-		ParodusError("Failed to open file %s (errno %d)\n", file_name, errno);
-		return 0;
-	}
-	fseek(fp, 0, SEEK_END);
-	ch_count = ftell(fp);
-	fseek(fp, 0, SEEK_SET);
-	*data = (char *) malloc(sizeof(char) * (ch_count + 1));
-	fread(*data, 1, ch_count,fp);
-	(*data)[ch_count] ='\0';
-	fclose(fp);
-	return 1;
-}
-
-
 void timespec_diff(struct timespec *start, struct timespec *stop,
                   struct timespec *diff)
 {
@@ -165,47 +139,3 @@ void timespec_diff(struct timespec *start, struct timespec *stop,

    return;
 }
-
-
-/*------------------------------------------------------------------------------*/
-/*                        For interface_down_event Flag                         */
-/*------------------------------------------------------------------------------*/
-
-// Get value of interface_down_event
-bool get_interface_down_event() 
-{
-	bool tmp = false;
-	pthread_mutex_lock (&interface_down_mut);
-	tmp = interface_down_event;
-	pthread_mutex_unlock (&interface_down_mut);
-	return tmp;
-}
-
-// Reset value of interface_down_event to false
-void reset_interface_down_event() 
-{
-	pthread_mutex_lock (&interface_down_mut);
-	interface_down_event = false;
-	pthread_cond_signal(&interface_down_con);
-	pthread_mutex_unlock (&interface_down_mut);
-}
-
-// set value of interface_down_event to true
-void set_interface_down_event() 
-{
-	pthread_mutex_lock (&interface_down_mut);
-    	interface_down_event = true;
-    	pthread_mutex_unlock (&interface_down_mut);
-}
-
-pthread_cond_t *get_interface_down_con(void)
-{
-    return &interface_down_con;
-}
-
-pthread_mutex_t *get_interface_down_mut(void)
-{
-    return &interface_down_mut;
-}
-
-
--- a/src/ParodusInternal.h
+++ b/src/ParodusInternal.h
@@ -49,7 +49,6 @@
 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */
 /*----------------------------------------------------------------------------*/
-
 #define UNUSED(x) (void )(x)
 #define NANO_SOCKET_SEND_TIMEOUT_MS                     2000
 #define NANO_SOCKET_RCV_TIMEOUT_MS			500
@@ -108,8 +107,6 @@ typedef struct {

 //--- Used in connection.c for backoff delay timer
 typedef struct {
-  unsigned long start_time;
-  struct timespec ts;
  int count;
  int max_count;
  int delay;
@@ -127,7 +124,7 @@ typedef struct {
 // wait_connection_ready, and nopoll_connect 
 typedef struct {
  noPollCtx *nopoll_ctx;
-  server_list_t *server_list;
+  server_list_t server_list;
  server_t *current_server;
  header_info_t header_info;
  char *extra_headers;		// need to be freed
@@ -139,6 +136,7 @@ typedef struct {
 /*----------------------------------------------------------------------------*/
 extern bool g_shutdown;
 extern ParodusMsg *ParodusMsgQ;
+int numLoops;
 /*----------------------------------------------------------------------------*/
 /*                             Function Prototypes                            */
 /*----------------------------------------------------------------------------*/
@@ -156,42 +154,9 @@ char* getWebpaConveyHeader();
 void *CRUDHandlerTask();
 void addCRUDmsgToQueue(wrp_msg_t *crudMsg);

-int readFromFile(const char *file_name, char **data);
-
 void timespec_diff(struct timespec *start, struct timespec *stop,
                   struct timespec *result);

-#ifdef ENABLE_WEBCFGBIN
-void subscribeRBUSevent();
-int regXmidtSendDataMethod();
-void registerRbusLogger();
-#endif
-#ifdef WAN_FAILOVER_SUPPORTED
-void setWebpaInterface(char *value);
-#endif
-/*------------------------------------------------------------------------------*/
-/*                        For interface_down_event Flag                         */
-/*------------------------------------------------------------------------------*/
-
-// Get value of interface_down_event
-bool get_interface_down_event();
-
-// Reset value of interface_down_event to false
-void reset_interface_down_event();
-
-// Set value of interface_down_event to true
-void set_interface_down_event();
-
-pthread_cond_t *get_interface_down_con();
-
-pthread_mutex_t *get_interface_down_mut();
-
-pthread_cond_t *get_global_cloud_status_cond(void);
-
-pthread_mutex_t *get_global_cloud_status_mut(void);
-
-int cloud_status_is_online (void);
-
 #ifdef __cplusplus
 }
 #endif
--- a/src/auth_token.c
+++ b/src/auth_token.c
@@ -24,7 +24,6 @@
 #include <stdio.h>
 #include <fcntl.h> 
 #include "config.h"
-#include "connection.h"
 #include "auth_token.h"
 #include "ParodusInternal.h"
 #include <cjwt/cjwt.h>
@@ -32,22 +31,16 @@
 #include <curl/curl.h>
 #include <uuid/uuid.h>

-#define MAX_BUF_SIZE	        256
+#define MAX_BUF_SIZE	        128
 #define CURL_TIMEOUT_SEC	25L
 #define MAX_CURL_RETRY_COUNT 	3
-
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
-void createCurlheader(struct curl_slist *list, struct curl_slist **header_list);
-long g_response_code;
+void createCurlheader(char *mac_header, char *serial_header, char *uuid_header, char *transaction_uuid, struct curl_slist *list, struct curl_slist **header_list);
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
-int getGlobalResponseCode()
-{
-	return g_response_code;
-}
 /*
 * @brief Initialize curl object with required options. create newToken using libcurl.
 * @param[out] newToken auth token string obtained from JWT curl response
@@ -64,8 +57,12 @@ int requestNewAuthToken(char *newToken, size_t len, int r_count)
 	struct curl_slist *list = NULL;
 	struct curl_slist *headers_list = NULL;

-	char webpa_interface[64]={'\0'};
+	char *mac_header = NULL;
+	char *serial_header = NULL;
+	char *uuid_header = NULL;
+	char *transaction_uuid = NULL;
 	double total;
+	long response_code;

 	struct token_data data;
 	data.size = 0;
@@ -76,15 +73,14 @@ int requestNewAuthToken(char *newToken, size_t len, int r_count)
 	{
 		data.data[0] = '\0';

-		createCurlheader(list, &headers_list);
+		createCurlheader(mac_header, serial_header, uuid_header, transaction_uuid, list, &headers_list);

 		curl_easy_setopt(curl, CURLOPT_URL, get_parodus_cfg()->token_server_url);
 		curl_easy_setopt(curl, CURLOPT_TIMEOUT, CURL_TIMEOUT_SEC);

-		parStrncpy(webpa_interface, getWebpaInterface(), sizeof(webpa_interface));
-		if(webpa_interface !=NULL && strlen(webpa_interface) >0)
+		if(get_parodus_cfg()->webpa_interface_used !=NULL && strlen(get_parodus_cfg()->webpa_interface_used) >0)
 		{
-			curl_easy_setopt(curl, CURLOPT_INTERFACE, webpa_interface);
+			curl_easy_setopt(curl, CURLOPT_INTERFACE, get_parodus_cfg()->webpa_interface_used);
 		}
 		/* set callback for writing received data */
 		curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback_fn);
@@ -122,8 +118,8 @@ int requestNewAuthToken(char *newToken, size_t len, int r_count)
 		/* Perform the request, res will get the return code */
 		res = curl_easy_perform(curl);

-		curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &g_response_code);
-		ParodusInfo("themis curl response %d http_code %d\n", res, g_response_code);
+		curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response_code);
+		ParodusInfo("themis curl response %d http_code %d\n", res, response_code);

 		time_res = curl_easy_getinfo(curl, CURLINFO_TOTAL_TIME, &total);
 		if(time_res == 0)
@@ -141,18 +137,10 @@ int requestNewAuthToken(char *newToken, size_t len, int r_count)
 		}
 		else
 		{
-			if(getGlobalResponseCode() == 200)
+			if(response_code == 200)
 			{
 				ParodusInfo("cURL success\n");
 			}
-			else
-			{
-				ParodusError("Failed response from auth token server %s\n", data.data);
-				curl_easy_cleanup(curl);
-				data.size = 0;
-				memset (data.data, 0, len);
-				return -1;
-			}
 		}
 		curl_easy_cleanup(curl);
 	}
@@ -223,14 +211,8 @@ void getAuthToken(ParodusCfg *cfg)
 * @param[in] nmemb size of delivered data
 * @param[out] data curl response data saved.
 */
-#ifndef DEVICE_CAMERA
 size_t write_callback_fn(void *buffer, size_t size, size_t nmemb, struct token_data *data)
 {
-#else
-size_t write_callback_fn(void *buffer, size_t size, size_t nmemb, void *datain)
-{
-    struct token_data *data = (struct token_data*) datain;
-#endif //DEVICE_CAMERA
    ParodusCfg *cfg;
    size_t max_data_size = sizeof (cfg->webpa_auth_token);
    size_t index = data->size;
@@ -269,60 +251,52 @@ char* generate_trans_uuid()
 }

 /* @brief function to create curl header contains mac, serial number and uuid.
- * @param[in] h the auth headers to populate
+ * @param[in] mac_header mac address header key value pair
+ * @param[in] serial_header serial number key value pair
+ * @param[in] uuid_header transaction uuid key value pair
 * @param[in] list temp curl header list
 * @param[out] header_list output curl header list
 */
-void createCurlheader(struct curl_slist *list, struct curl_slist **header_list)
+void createCurlheader(char *mac_header, char *serial_header, char *uuid_header, char *transaction_uuid, struct curl_slist *list, struct curl_slist **header_list)
 {
-    char buf[MAX_BUF_SIZE];
-    char *uuid = NULL;
+	mac_header = (char *) malloc(sizeof(char)*MAX_BUF_SIZE);
+	if(mac_header !=NULL)
+	{
+		snprintf(mac_header, MAX_BUF_SIZE, "X-Midt-Mac-Address: %s", get_parodus_cfg()->hw_mac);
+		ParodusPrint("mac_header formed %s\n", mac_header);
+		list = curl_slist_append(list, mac_header);
+		free(mac_header);
+		mac_header = NULL;
+	}

-    snprintf(buf, MAX_BUF_SIZE, "X-Midt-Mac-Address: %s", get_parodus_cfg()->hw_mac);
-    ParodusPrint("mac_header formed %s\n", buf);
-    list = curl_slist_append(list, buf);
+	serial_header = (char *) malloc(sizeof(char)*MAX_BUF_SIZE);
+	if(serial_header !=NULL)
+	{
+		snprintf(serial_header, MAX_BUF_SIZE, "X-Midt-Serial-Number: %s", get_parodus_cfg()->hw_serial_number);
+		ParodusPrint("serial_header formed %s\n", serial_header);
+		list = curl_slist_append(list, serial_header);
+		free(serial_header);
+		serial_header = NULL;
+	}

-    snprintf(buf, MAX_BUF_SIZE, "X-Midt-Serial-Number: %s", get_parodus_cfg()->hw_serial_number);
-    ParodusPrint("serial_header formed %s\n", buf);
-    list = curl_slist_append(list, buf);
-
-    uuid = generate_trans_uuid();
-    if(uuid !=NULL) {
-        snprintf(buf, MAX_BUF_SIZE, "X-Midt-Uuid: %s", uuid);
-        ParodusInfo("uuid_header formed %s\n", buf);
-        list = curl_slist_append(list, buf);
-        free(uuid);
-    } else {
-        ParodusError("Failed to generate transaction_uuid\n");
-    }
-
-    snprintf(buf, MAX_BUF_SIZE, "X-Midt-Partner-Id: %s", get_parodus_cfg()->partner_id);
-    ParodusInfo("partnerid_header formed %s\n", buf);
-    list = curl_slist_append(list, buf);
-
-    snprintf(buf, MAX_BUF_SIZE, "X-Midt-Hardware-Model: %s", get_parodus_cfg()->hw_model);
-    list = curl_slist_append(list, buf);
-
-    snprintf(buf, MAX_BUF_SIZE, "X-Midt-Hardware-Manufacturer: %s", get_parodus_cfg()->hw_manufacturer);
-    list = curl_slist_append(list, buf);
-
-    snprintf(buf, MAX_BUF_SIZE, "X-Midt-Firmware-Name: %s", get_parodus_cfg()->fw_name);
-    list = curl_slist_append(list, buf);
-
-    snprintf(buf, MAX_BUF_SIZE, "X-Midt-Protocol: %s", get_parodus_cfg()->webpa_protocol);
-    list = curl_slist_append(list, buf);
-
-    snprintf(buf, MAX_BUF_SIZE, "X-Midt-Interface-Used: %s", getWebpaInterface());
-    list = curl_slist_append(list, buf);
-
-    snprintf(buf, MAX_BUF_SIZE, "X-Midt-Last-Reboot-Reason: %s", get_parodus_cfg()->hw_last_reboot_reason);
-    list = curl_slist_append(list, buf);
-
-    snprintf(buf, MAX_BUF_SIZE, "X-Midt-Last-Reconnect-Reason: %s", get_global_reconnect_reason());
-    list = curl_slist_append(list, buf);
-
-    snprintf(buf, MAX_BUF_SIZE, "X-Midt-Boot-Retry-Wait: %d", get_parodus_cfg()->boot_retry_wait);
-    list = curl_slist_append(list, buf);
-
-    *header_list = list;
+	transaction_uuid = generate_trans_uuid();
+	if(transaction_uuid !=NULL)
+	{
+		uuid_header = (char *) malloc(sizeof(char)*MAX_BUF_SIZE);
+		if(uuid_header !=NULL)
+		{
+			snprintf(uuid_header, MAX_BUF_SIZE, "X-Midt-Uuid: %s", transaction_uuid);
+			ParodusInfo("uuid_header formed %s\n", uuid_header);
+			list = curl_slist_append(list, uuid_header);
+			free(transaction_uuid);
+			transaction_uuid = NULL;
+			free(uuid_header);
+			uuid_header = NULL;
+		}
+	}
+	else
+	{
+		ParodusError("Failed to generate transaction_uuid\n");
+	}
+	*header_list = list;
 }
--- a/src/auth_token.h
+++ b/src/auth_token.h
@@ -47,11 +47,7 @@ struct token_data {

 int requestNewAuthToken(char *newToken, size_t len, int r_count);
 void getAuthToken(ParodusCfg *cfg);
-#ifndef DEVICE_CAMERA
 size_t write_callback_fn(void *buffer, size_t size, size_t nmemb, struct token_data *data);
-#else
-size_t write_callback_fn(void *buffer, size_t size, size_t nmemb, void *data);
-#endif
 char* generate_trans_uuid();

 #ifdef __cplusplus
--- a/src/client_list.c
+++ b/src/client_list.c
@@ -294,24 +294,3 @@ int sendMsgtoRegisteredClients(char *dest,const char **Msg,size_t msgSize)
 	release_global_node ();
 	return 0;
 }
-
-//To check client registration status with parodus.
-int checkClientStatus(char *serviceName)
-{
-	reg_list_item_t *temp = NULL;
-	temp = get_global_node();
-	while (NULL != temp)
-	{
-		ParodusPrint("node is pointing to temp->service_name %s \n",temp->service_name);
-		// Sending message to registered clients
-		if( strcmp(serviceName, temp->service_name) == 0)
-		{
-			release_global_node ();
-			return 1;
-		}
-		ParodusPrint("checking the next item in the list\n");
-		temp= temp->next;
-	}
-	release_global_node ();
-	return 0;
-}
--- a/src/client_list.h
+++ b/src/client_list.h
@@ -56,7 +56,7 @@ int sendMsgtoRegisteredClients(char *dest,const char **Msg,size_t msgSize);

 reg_list_item_t * get_global_node(void);
 void release_global_node (void);
-int checkClientStatus();
+
 #ifdef __cplusplus
 }
 #endif
--- a/src/config.c
+++ b/src/config.c
@@ -33,13 +33,6 @@
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
-pthread_mutex_t config_mut=PTHREAD_MUTEX_INITIALIZER;
-
-//For sending cond signal when cloud status is ONLINE
-pthread_mutex_t cloud_status_mut=PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t cloud_status_cond=PTHREAD_COND_INITIALIZER;
-
-char webpa_interface[64]={'\0'};

 static ParodusCfg parodusCfg;
 static unsigned int rsa_algorithms = 
@@ -47,15 +40,6 @@ static unsigned int rsa_algorithms =
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
-pthread_cond_t *get_global_cloud_status_cond(void)
-{
-    return &cloud_status_cond;
-}
-
-pthread_mutex_t *get_global_cloud_status_mut(void)
-{
-    return &cloud_status_mut;
-}

 ParodusCfg *get_parodus_cfg(void) 
 {
@@ -77,31 +61,6 @@ void reset_cloud_disconnect_reason(ParodusCfg *cfg)
 	cfg->cloud_disconnect = NULL;
 }

-void set_cloud_status(char *status)
-{
-    if(status != NULL)
-    {
-        pthread_mutex_lock(&config_mut);
-        get_parodus_cfg()->cloud_status = status;
-        if(strcmp (status, CLOUD_STATUS_ONLINE) == 0)
-        {
-              pthread_cond_signal(&cloud_status_cond);
-        }
-        pthread_mutex_unlock(&config_mut);
-    }
-}
-
-char *get_cloud_status(void)
-{
-    char *status = NULL;
-    pthread_mutex_lock(&config_mut);
-    if(NULL != get_parodus_cfg()->cloud_status)
-    {
-    	status = get_parodus_cfg()->cloud_status;
-    }
-    pthread_mutex_unlock(&config_mut);
-    return status;    
-}

 const char *get_tok (const char *src, int delim, char *result, int resultsize)
 {
@@ -187,9 +146,9 @@ void read_key_from_file (const char *fname, char *buf, size_t buflen)
 int parse_mac_address (char *target, const char *arg)
 {
 	int count = 0;
-	int i, j;
+	int i;
 	char c;
-	char *mac = target;
+
 	for (i=0; (c=arg[i]) != 0; i++) {
 		if (c !=':')
 			count++;
@@ -201,48 +160,9 @@ int parse_mac_address (char *target, const char *arg)
 			*(target++) = c;
 	}
 	*target = 0;	// terminating null
-
-	//convert mac to lowercase
-	for(j = 0; mac[j]; j++)
-	{
-		mac[j] = tolower(mac[j]);
-	}
-	ParodusPrint("mac in lowercase is %s\n", mac);
 	return 0;
 }

-int parse_serial_num(char *target, const char *arg)
-{
-	char ch;
-	if(arg != NULL)
-	{
-	    if(strlen(arg) == 0)
-	    {
-	   	ParodusError("Empty serial number, setting to default unknown\n");
-		strcpy(target,"unknown");
-	    }
-            for(int i=0; (ch = arg[i]) != '\0'; i++)
-	    {
-	        // check if character is ascii, a-z --> 97 to 122, A-Z --> 65 to 90, digits(0 to 9) --> 48 to 57
-	    	if((ch >= 97 && ch <= 122) || (ch >= 65 && ch <= 90) || (ch >=48 && ch <= 57))
-	        {
-		    target[i] = ch;
-	        }
-	        else
-	        {
-		    ParodusError("Invalid serial number, setting to default unknown\n");
-		    strcpy(target,"unknown");
-		    break;
-	        }
-	    }
-	}
-        else
-        {
-            ParodusError("serial number argument is NULL\n");
-        }
-   return 0;	
-}
-
 int server_is_http (const char *full_url,
 	const char **server_ptr)
 {
@@ -294,13 +214,8 @@ int parse_webpa_url__ (const char *full_url,
    if(openBracket != NULL){
        //Remove [ from server address
        char *remove = server_addr;
-        int i;
-
-        // Strings can overlap, so don't use strncpy()
        remove++;
-        for( i = 0; i < server_addr_buflen; i++ ) {
-            server_addr[i] = remove[i];
-        }
+        parStrncpy (server_addr, remove, server_addr_buflen);
        closeBracket = strchr(server_addr,']');
        if(closeBracket != NULL){
            //Remove ] by making it as null
@@ -435,9 +350,6 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
        {"webpa-backoff-max",       required_argument, 0, 'o'},
        {"webpa-interface-used",    required_argument, 0, 'i'},
        {"parodus-local-url",       required_argument, 0, 'l'},
-#ifdef ENABLE_WEBCFGBIN
-	{"max-queue-size",          required_argument, 0, 'q'},
-#endif	
        {"partner-id",              required_argument, 0, 'p'},
 #ifdef ENABLE_SESHAT
        {"seshat-url",              required_argument, 0, 'e'},
@@ -454,7 +366,6 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
 	{"token-server-url",        required_argument, 0, 'U'},
 	{"crud-config-file",        required_argument, 0, 'C'},
 	{"connection-health-file",  required_argument, 0, 'S'},
-	{"close-reason-file",  		required_argument, 0, 'R'},
 	{"mtls-client-key-path",    required_argument, 0, 'K'},
 	{"mtls-client-cert-path",    required_argument, 0,'M'},
        {0, 0, 0, 0}
@@ -473,7 +384,6 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
 	parStrncpy (cfg->jwt_key, "", sizeof(cfg->jwt_key));
 	cfg->crud_config_file = NULL;
 	cfg->connection_health_file = NULL;
-	cfg->close_reason_file = NULL;
 	cfg->client_cert_path = NULL;
 	cfg->token_server_url = NULL;
 	cfg->cloud_status = NULL;
@@ -484,9 +394,8 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)

      /* getopt_long stores the option index here. */
      int option_index = 0;
-      c = getopt_long (argc, argv, 
-			"m:s:f:d:r:n:b:u:t:o:i:l:q:p:e:D:j:a:k:c:T:w:J:46:C:S:R:K:M",
-			long_options, &option_index);
+      c = getopt_long (argc, argv, "m:s:f:d:r:n:b:u:t:o:i:l:p:e:D:j:a:k:c:T:w:J:46:C:S:K:M",
+				long_options, &option_index);

      /* Detect the end of the options. */
      if (c == -1)
@@ -500,8 +409,8 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
         break;
        
        case 's':
-	if(parse_serial_num(cfg->hw_serial_number, optarg) == 0)
-            ParodusInfo ("hw_serial_number is %s\n",cfg->hw_serial_number);
+          parStrncpy(cfg->hw_serial_number,optarg,sizeof(cfg->hw_serial_number));
+          ParodusInfo("hw_serial_number is %s\n",cfg->hw_serial_number);
          break;

        case 'f':
@@ -526,7 +435,6 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
        case 'r':
          parStrncpy(cfg->hw_last_reboot_reason, optarg,sizeof(cfg->hw_last_reboot_reason));
          ParodusInfo("hw_last_reboot_reason is %s\n",cfg->hw_last_reboot_reason);
-          OnboardLog("Last reboot reason is %s\n",cfg->hw_last_reboot_reason);
          break;

        case 'n':
@@ -571,16 +479,6 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
          parStrncpy(cfg->local_url, optarg,sizeof(cfg->local_url));
          ParodusInfo("parodus local_url is %s\n",cfg->local_url);
          break;
-
-#ifdef ENABLE_WEBCFGBIN
-	case 'q':
-	  cfg->max_queue_size = parse_num_arg (optarg, "max-queue-size");
-          if (cfg->max_queue_size == (unsigned int) -1)
-                        return -1;
-          ParodusInfo("max_queue_size is %d\n",cfg->max_queue_size);
-          break;
-#endif  
-
        case 'D':
          // like 'fabric' or 'test'
          // this parameter is used, along with the hw_mac parameter
@@ -639,22 +537,17 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
 	  ParodusInfo("connection_health_file is %s\n", cfg->connection_health_file);
 	  break;

-	case 'R':
-	  cfg->close_reason_file = strdup(optarg);
-	  ParodusInfo("sigterm_close_reason_file is %s\n", cfg->close_reason_file);
-	  break;
-
 	case 'C':
 	  cfg->crud_config_file = strdup(optarg);
 	  ParodusInfo("crud_config_file is %s\n", cfg->crud_config_file);
 	  break;

-	case 'P':
+		case 'P':
 		cfg->client_cert_path = strdup(optarg);
 		ParodusInfo("client_cert_path is %s\n", cfg->client_cert_path);
 		break;

-	case 'U':
+		case 'U':
 		cfg->token_server_url = strdup(optarg);
 		ParodusInfo("token_server_url is %s\n", cfg->token_server_url);
 		break;
@@ -711,53 +604,6 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
    return 0;
 }

-void free_cfg(ParodusCfg *cfg)
-{
-    if(cfg != NULL)
-    {
-	    if (cfg->mtls_client_cert_path != NULL )
-	    {
-		 free(cfg->mtls_client_cert_path);
-		 cfg->mtls_client_cert_path = NULL;
-	    }
-	    if(cfg->connection_health_file != NULL)
-	    {
-		free(cfg->connection_health_file);
-		cfg->connection_health_file = NULL;
-	    }
-	    if(cfg->token_server_url != NULL)
-	    {
-		free(cfg->token_server_url );
-		cfg->token_server_url = NULL;
-	    }
-	    if(cfg->mtls_client_key_path != NULL)
-	    {
-		free(cfg->mtls_client_key_path);
-		cfg->mtls_client_key_path = NULL;
-	    }
-	    if(cfg->client_cert_path != NULL)
-	    {
-		free(cfg->client_cert_path);
-		cfg->client_cert_path = NULL;
-	    }
-	    if(cfg->crud_config_file != NULL)
-	    {
-		free(cfg->crud_config_file);
-		cfg->crud_config_file = NULL;
-	    }
-	    if(cfg->close_reason_file != NULL)
-	    {
-		free(cfg->close_reason_file);
-		cfg->close_reason_file = NULL;
-	    }
-	    if(cfg->cloud_disconnect != NULL)
-	    {
-		free(cfg->cloud_disconnect);
-		cfg->cloud_disconnect = NULL;
-	    }
-    }
-}
-
 void setDefaultValuesToCfg(ParodusCfg *cfg)
 {
    if(cfg == NULL)
@@ -790,7 +636,6 @@ void setDefaultValuesToCfg(ParodusCfg *cfg)
    ParodusPrint("cfg->webpa_uuid is :%s\n", cfg->webpa_uuid);
    cfg->crud_config_file = NULL;
    cfg->connection_health_file = NULL;
-    cfg->close_reason_file = NULL;
    cfg->client_cert_path = NULL;
    cfg->token_server_url = NULL;
 	
@@ -864,7 +709,7 @@ void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg)
    }
    if(strlen(config->webpa_interface_used )!=0)
    {
-        parStrncpy(getWebpaInterface(), config->webpa_interface_used,sizeof(getWebpaInterface()));
+        parStrncpy(cfg->webpa_interface_used, config->webpa_interface_used,sizeof(cfg->webpa_interface_used));
    }
    else
    {
@@ -932,9 +777,7 @@ void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg)
        parStrncpy(cfg->cert_path, "\0", sizeof(cfg->cert_path));
        ParodusPrint("cert_path is NULL. set to empty\n");
    }
-    #ifdef ENABLE_WEBCFGBIN
-        cfg->max_queue_size =  config->max_queue_size;
-    #endif
+
    cfg->boot_time = config->boot_time;
    cfg->webpa_ping_timeout = config->webpa_ping_timeout;
    cfg->webpa_backoff_max = config->webpa_backoff_max;
@@ -953,15 +796,6 @@ void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg)
        ParodusPrint("connection_health_file is NULL. set to empty\n");
    }

-    if(config->close_reason_file != NULL)
-    {
-        cfg->close_reason_file = strdup(config->close_reason_file);
-    }
-    else
-    {
-        ParodusPrint("close_reason_file is NULL. set to empty\n");
-    }
-
    if(config->crud_config_file != NULL)
    {
        cfg->crud_config_file = strdup(config->crud_config_file);
@@ -990,26 +824,4 @@ void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg)
    }
 }

-#ifdef WAN_FAILOVER_SUPPORTED
-void setWebpaInterface(char *value)
-{
-	pthread_mutex_lock (&config_mut);
-	parStrncpy(get_parodus_cfg()->webpa_interface_used, value, sizeof(get_parodus_cfg()->webpa_interface_used));
-	pthread_mutex_unlock (&config_mut);
-}
-#endif
-
-char *getWebpaInterface(void)
-{
-	#ifdef WAN_FAILOVER_SUPPORTED	
-		ParodusPrint("WAN_FAILOVER_SUPPORTED mode \n");
-		pthread_mutex_lock (&config_mut);	
-		parStrncpy(webpa_interface, get_parodus_cfg()->webpa_interface_used, sizeof(webpa_interface));
-		pthread_mutex_unlock (&config_mut);
-	#else
-		parStrncpy(webpa_interface, get_parodus_cfg()->webpa_interface_used, sizeof(webpa_interface));
-	#endif
-		ParodusPrint("webpa_interface:%s\n", webpa_interface);
-		return webpa_interface;
-}

--- a/src/config.h
+++ b/src/config.h
@@ -24,7 +24,6 @@
 #ifndef _CONFIG_H_ 
 #define _CONFIG_H_

-#include <pthread.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -76,7 +75,7 @@ typedef struct
    char hw_serial_number[64];
    char hw_manufacturer[64];
    char hw_mac[64];
-    char hw_last_reboot_reason[128];
+    char hw_last_reboot_reason[64];
    char fw_name[64];
    unsigned int boot_time;
    unsigned int webpa_ping_timeout;
@@ -88,9 +87,6 @@ typedef struct
    char webpa_uuid[64];
    unsigned int flags;
    char local_url[124];
-#ifdef ENABLE_WEBCFGBIN
-    unsigned int max_queue_size;
-#endif    
    char partner_id[64];
 #ifdef ENABLE_SESHAT
    char seshat_url[128];
@@ -106,7 +102,6 @@ typedef struct
    char *client_cert_path;
    char *token_server_url;
    char *connection_health_file;
-    char *close_reason_file;
    char *mtls_client_key_path;
    char *mtls_client_cert_path;
 	char *crud_config_file;
@@ -135,7 +130,7 @@ void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg);
 *    or -1 if error
 */ 
 int parseCommandLine(int argc,char **argv,ParodusCfg * cfg);
-void free_cfg(ParodusCfg *cfg);
+
 void setDefaultValuesToCfg(ParodusCfg *cfg); 
 // Accessor for the global config structure.
 ParodusCfg *get_parodus_cfg(void);
@@ -143,10 +138,6 @@ void set_parodus_cfg(ParodusCfg *);
 char *get_token_application(void) ;
 void set_cloud_disconnect_reason(ParodusCfg *cfg, char *disconn_reason);
 void reset_cloud_disconnect_reason(ParodusCfg *cfg);
-char *getWebpaInterface(void);
-void set_cloud_status(char *status);
-char *get_cloud_status(void);
-int get_parodus_init();
 /**
 * parse a webpa url. Extract the server address, the port
 * and return whether it's secure or not
--- a/src/conn_interface.c
+++ b/src/conn_interface.c
@@ -33,7 +33,6 @@
 #include "spin_thread.h"
 #include "service_alive.h"
 #include "seshat_interface.h"
-#include "event_handler.h"
 #include "crud_interface.h"
 #include "heartBeat.h"
 #include "close_retry.h"
@@ -74,10 +73,8 @@ void createSocketConnection(void (* initKeypress)())
 {
    //ParodusCfg *tmpCfg = (ParodusCfg*)config_in;
    noPollCtx *ctx;
-    server_list_t server_list;  
    bool seshat_registered = false;
    int create_conn_rtn = 0;
-    int nopoll_returnvalue = 0;	
    unsigned int webpa_ping_timeout_ms = 1000 * get_parodus_cfg()->webpa_ping_timeout;
    unsigned int heartBeatTimer = 0;
    struct timespec start_svc_alive_timer;
@@ -98,16 +95,12 @@ void createSocketConnection(void (* initKeypress)())
    nopoll_log_set_handler (ctx, __report_log, NULL);
    #endif

-    EventHandler();
-    #ifdef WAN_FAILOVER_SUPPORTED
-    subscribeCurrentActiveInterfaceEvent();
-    #endif
-    set_server_list_null (&server_list);
-    create_conn_rtn = createNopollConnection(ctx, &server_list);
+    start_conn_in_progress ();
+    create_conn_rtn = createNopollConnection(ctx);
+    stop_conn_in_progress ();
    if(!create_conn_rtn)
    {
 		ParodusError("Unrecovered error, terminating the process\n");
-		OnboardLog("Unrecovered error, terminating the process\n");
 		abort();
    }
    packMetaData();
@@ -134,17 +127,14 @@ void createSocketConnection(void (* initKeypress)())
        struct timespec start, stop, diff;
        int time_taken_ms;

-        clock_gettime(CLOCK_MONOTONIC, &start);
-        nopoll_returnvalue = nopoll_loop_wait(ctx, 5000000);
-        clock_gettime(CLOCK_MONOTONIC, &stop);
+        clock_gettime(CLOCK_REALTIME, &start);
+        nopoll_loop_wait(ctx, 5000000);
+        clock_gettime(CLOCK_REALTIME, &stop);

        timespec_diff(&start, &stop, &diff);
        time_taken_ms = diff.tv_sec * 1000 + (diff.tv_nsec / 1000000);
-	if(time_taken_ms/1000 != 5)
-	{
-        	ParodusInfo("nopoll_loop_wait value %d,nopoll_loop_wait() time %d msec\n",nopoll_returnvalue, time_taken_ms);
-	}
-	ParodusPrint("webpa_ping_timeout_ms %d msec\n", webpa_ping_timeout_ms);
+
+        // ParodusInfo("nopoll_loop_wait() time %d msec\n", time_taken_ms);
 	heartBeatTimer = get_heartBeatTimer();
        if(heartBeatTimer >= webpa_ping_timeout_ms)
        {
@@ -154,14 +144,8 @@ void createSocketConnection(void (* initKeypress)())
            {
                ParodusError("ping wait time > %d . Terminating the connection with WebPA server and retrying\n", webpa_ping_timeout_ms / 1000);
                ParodusInfo("Reconnect detected, setting Ping_Miss reason for Reconnect\n");
-                OnboardLog("Reconnect detected, setting Ping_Miss reason for Reconnect\n");
                set_global_reconnect_reason("Ping_Miss");
                set_global_reconnect_status(true);
-		// Invoke the ping status change event callback as "missed" ping
-		if(NULL != on_ping_status_change)
-		{ 
-			on_ping_status_change("missed");
-		}
                set_close_retry();
            }
            else
@@ -177,17 +161,15 @@ void createSocketConnection(void (* initKeypress)())
        if( false == seshat_registered ) {
            seshat_registered = __registerWithSeshat();
        }
-        
-        if (get_interface_down_event ())
-          if (0 != wait_while_interface_down ())
-            break;

        if(get_close_retry())
        {
            ParodusInfo("close_retry is %d, hence closing the connection and retrying\n", get_close_retry());
-            close_and_unref_connection(get_global_conn(), false);
+            close_and_unref_connection(get_global_conn());
            set_global_conn(NULL);

+            get_parodus_cfg()->cloud_status = CLOUD_STATUS_OFFLINE;
+            ParodusInfo("cloud_status set as %s after connection close\n", get_parodus_cfg()->cloud_status);
            if(get_parodus_cfg()->cloud_disconnect !=NULL)
            {
                ParodusPrint("get_parodus_cfg()->cloud_disconnect is %s\n", get_parodus_cfg()->cloud_disconnect);
@@ -199,10 +181,11 @@ void createSocketConnection(void (* initKeypress)())
 		free(get_parodus_cfg()->cloud_disconnect);
 		reset_cloud_disconnect_reason(get_parodus_cfg());
            }
-            createNopollConnection(ctx, &server_list);
+            start_conn_in_progress ();
+            createNopollConnection(ctx);
+            stop_conn_in_progress ();
        }
-	 //process exit only when g_shutdown is true.
-       } while(FOREVER() && !g_shutdown);
+       } while(!get_close_retry() && !g_shutdown);

    pthread_mutex_lock (get_global_svc_mut());
    pthread_cond_signal (get_global_svc_con());
@@ -226,20 +209,13 @@ void createSocketConnection(void (* initKeypress)())

    deleteAllClients ();

-    ParodusInfo ("reconnect reason at close %s\n", get_global_reconnect_reason());
-    close_and_unref_connection(get_global_conn(), true);
+    close_and_unref_connection(get_global_conn());
    nopoll_ctx_unref(ctx);
    nopoll_cleanup_library();
    curl_global_cleanup();
-    clear_metadata();
-    rdk_logger_deinit();
-    free_server_list(&server_list);
 }

-void shutdownSocketConnection(char *reason) {
-   set_global_shutdown_reason (reason);
+void shutdownSocketConnection(void) {
   g_shutdown = true;
-   reset_interface_down_event ();
-   terminate_backoff_delay ();
 }

--- a/src/conn_interface.h
+++ b/src/conn_interface.h
@@ -45,7 +45,7 @@ extern UpStreamMsg *UpStreamMsgQ;
 *  and creates the intial connection and manages the connection wait, close mechanisms.
 */
 void createSocketConnection(void (* initKeypress)());
-void shutdownSocketConnection(char *reason);
+void shutdownSocketConnection(void);
   
 #ifdef __cplusplus
 }
--- a/src/connection.c
+++ b/src/connection.c
@@ -38,38 +38,11 @@

 #define HTTP_CUSTOM_HEADER_COUNT                    	5
 #define INITIAL_CJWT_RETRY                    	-2
-#define UPDATE_HEALTH_FILE_INTERVAL_SECS		240
-
-/* Close codes defined in RFC 6455, section 11.7. */
-enum {
-	CloseNormalClosure           = 1000,
-	CloseGoingAway               = 1001,
-	CloseProtocolError           = 1002,
-	CloseUnsupportedData         = 1003,
-	CloseNoStatus		     = 1005,
-	CloseAbnormalClosure         = 1006,
-	CloseInvalidFramePayloadData = 1007,
-	ClosePolicyViolation         = 1008,
-	CloseMessageTooBig           = 1009,
-	CloseMandatoryExtension      = 1010,
-	CloseInternalServerErr       = 1011,
-	CloseServiceRestart          = 1012,
-	CloseTryAgainLater           = 1013,
-	CloseTLSHandshake            = 1015
-};

 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/

-parodusOnConnStatusChangeHandler on_conn_status_change;
-
-parodusOnPingStatusChangeHandler on_ping_status_change;
-
-pthread_mutex_t backoff_delay_mut=PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t backoff_delay_con=PTHREAD_COND_INITIALIZER;
-
-static char *shutdown_reason = SHUTDOWN_REASON_PARODUS_STOP;  /* goes in the close message */
 static char *reconnect_reason = "webpa_process_starts";
 static int cloud_disconnect_max_time = 5;
 static noPollConn *g_conn = NULL;
@@ -92,16 +65,6 @@ void set_global_conn(noPollConn *conn)
    g_conn = conn;
 }

-char *get_global_shutdown_reason()
-{
-    return shutdown_reason;
-}
-
-void set_global_shutdown_reason(char *reason)
-{
-    shutdown_reason = reason;
-}
-
 char *get_global_reconnect_reason()
 {
    return reconnect_reason;
@@ -132,10 +95,7 @@ void set_cloud_disconnect_time(int disconnTime)
    cloud_disconnect_max_time = disconnTime;
 }

-int get_parodus_init()
-{
-   return init;
-}
+
 //--------------------------------------------------------------------
 // createNopollConnection_logic:

@@ -239,122 +199,30 @@ void init_backoff_timer (backoff_timer_t *timer, int max_count)
  timer->count = 1;
  timer->max_count = max_count;
  timer->delay = 1;
-  clock_gettime (CLOCK_MONOTONIC, &timer->ts);
-  timer->start_time = time(NULL);
 }

-unsigned update_backoff_delay (backoff_timer_t *timer)
+int update_backoff_delay (backoff_timer_t *timer)
 {
  if (timer->count < timer->max_count) {
    timer->count += 1;
    timer->delay = timer->delay + timer->delay + 1;
    // 3,7,15,31 ..
  }
-  return (unsigned) timer->delay;
+  return timer->delay;
 }  

-void add_timespec (struct timespec *t1, struct timespec *t2)
+static void backoff_delay (backoff_timer_t *timer)
 {
-	t2->tv_sec += t1->tv_sec;
-	t2->tv_nsec += t1->tv_nsec;
-	if (t2->tv_nsec >= 1000000000) {
-	  t2->tv_sec += 1;
-	  t2->tv_nsec -= 1000000000;
-	}
-}
+  update_backoff_delay (timer);

-unsigned calc_random_secs (int random_num, unsigned max_secs)
-{
-  unsigned delay_secs = (unsigned) random_num & max_secs;
-  if (delay_secs < 3)
-    return delay_secs + 3;
-  else
-    return delay_secs;
-}
-
-unsigned calc_random_nsecs (int random_num)
-{
-	/* random _num is in range 0..2147483648 */
-	unsigned n = (unsigned) random_num >> 1;
-	/* n is in range 0..1073741824 */
-	if (n < 1000000000)
-	  return n;
-	return n - 1000000000;
-}
-
-void calc_random_expiration (int random_num1, int random_num2, backoff_timer_t *timer, struct timespec *ts)
-{
-	unsigned max_secs = update_backoff_delay (timer); // 3,7,15,31
-	struct timespec ts_delay = {3, 0};
-	
-	if (max_secs > 3) {
-	  ts_delay.tv_sec = calc_random_secs (random_num1, max_secs);
-	  ts_delay.tv_nsec = calc_random_nsecs (random_num2);
-	}
-    ParodusInfo("Waiting max delay %u backoffRetryTime %ld secs %ld usecs\n", 
-      max_secs, ts_delay.tv_sec, ts_delay.tv_nsec/1000);
-      
-	/* Add delay to expire time */
-    add_timespec (&ts_delay, ts);
-}
-
-void terminate_backoff_delay (void)
-{
-	pthread_mutex_lock (&backoff_delay_mut);
-	pthread_cond_signal(&backoff_delay_con);
-	pthread_mutex_unlock (&backoff_delay_mut);
-}
-
-#define BACKOFF_ERR -1
-#define BACKOFF_SHUTDOWN   1
-#define BACKOFF_DELAY_TAKEN 0
-
-void start_conn_in_progress (unsigned long start_time);
-
-/* backoff_delay
- * 
- * delays for the number of seconds specified in parameter timer
- * g_shutdown can break out of the delay.
- *
- * returns -1 pthread_cond_timedwait error
- *  1   shutdown
- *  0    delay taken
-*/  
-static int backoff_delay (backoff_timer_t *timer)
-{
-  struct timespec ts;
-  int rtn;
-
-  pthread_condattr_t backoff_delay_cond_attr;
-
-  pthread_condattr_init (&backoff_delay_cond_attr);
-  pthread_condattr_setclock (&backoff_delay_cond_attr, CLOCK_MONOTONIC);
-  pthread_cond_init (&backoff_delay_con, &backoff_delay_cond_attr);
-
-  // periodically update the health file.
-  clock_gettime (CLOCK_MONOTONIC, &ts);
-  if ((ts.tv_sec - timer->ts.tv_sec) >= UPDATE_HEALTH_FILE_INTERVAL_SECS) {
-    start_conn_in_progress (timer->start_time);
-    timer->ts.tv_sec += UPDATE_HEALTH_FILE_INTERVAL_SECS;
-  }	  
-
-  calc_random_expiration (random(), random(), timer, &ts);
-
-  pthread_mutex_lock (&backoff_delay_mut);
-  // The condition variable will only be set if we shut down.
-  rtn = pthread_cond_timedwait (&backoff_delay_con, &backoff_delay_mut, &ts);
-  pthread_mutex_unlock (&backoff_delay_mut);
-
-  pthread_condattr_destroy(&backoff_delay_cond_attr);
-
-  if (g_shutdown)
-    return BACKOFF_SHUTDOWN;
-  if ((rtn != 0) && (rtn != ETIMEDOUT)) {
-    ParodusError ("pthread_cond_timedwait error (%d) in backoff_delay.\n", rtn);
-    return BACKOFF_ERR;
+  // Update retry time for conn progress
+  if(timer->count == timer->max_count) 
+  {
+	start_conn_in_progress();
  }

-  return BACKOFF_DELAY_TAKEN;
+  ParodusInfo("Waiting with backoffRetryTime %d seconds\n", timer->delay);
+  sleep (timer->delay);
 }  

 //--------------------------------------------------------------------
@@ -432,7 +300,7 @@ char *build_extra_hdrs (header_info_t *header_info)
 //--------------------------------------------------------------------
 void set_current_server (create_connection_ctx_t *ctx)
 {
-  ctx->current_server = get_current_server (ctx->server_list);
+  ctx->current_server = get_current_server (&ctx->server_list);
 }

 void free_extra_headers (create_connection_ctx_t *ctx)
@@ -458,8 +326,7 @@ void free_connection_ctx (create_connection_ctx_t *ctx)
 {
  free_extra_headers (ctx);
  free_header_info (&ctx->header_info);
-  if (NULL != ctx->server_list)
-    free_server_list (ctx->server_list);
+  free_server_list (&ctx->server_list);
 }


@@ -476,10 +343,8 @@ int find_servers (server_list_t *server_list)

  free_server_list (server_list);
  // parse default server URL
-  if (parse_server_url (get_parodus_cfg()->webpa_url, default_server) < 0) {
-	ParodusError ("Invalid Default URL\n");
-    return FIND_INVALID_DEFAULT;
-  }
+  if (parse_server_url (get_parodus_cfg()->webpa_url, default_server) < 0)
+     return FIND_INVALID_DEFAULT;	// must have valid default url
  ParodusInfo("default server_Address %s\n", default_server->server_addr);
  ParodusInfo("default port %u\n", default_server->port);
 #ifdef FEATURE_DNS_QUERY
@@ -497,6 +362,7 @@ int find_servers (server_list_t *server_list)
  return FIND_SUCCESS;
 }

+
 //--------------------------------------------------------------------
 // connect to current server
 int nopoll_connect (create_connection_ctx_t *ctx, int is_ipv6)
@@ -532,10 +398,8 @@ int nopoll_connect (create_connection_ctx_t *ctx, int is_ipv6)
   }
   if ((NULL == connection) && (!is_ipv6)) {
     if((checkHostIp(server->server_addr) == -2)) {
-       if (check_timer_expired (&ctx->connect_timer, 15*60*1000) && !get_interface_down_event()) {
+       if (check_timer_expired (&ctx->connect_timer, 15*60*1000)) {
  	 ParodusError("WebPA unable to connect due to DNS resolving to 10.0.0.1 for over 15 minutes; crashing service.\n");
-	 OnboardLog("WebPA unable to connect due to DNS resolving to 10.0.0.1 for over 15 minutes; crashing service.\n");
-	 OnboardLog("Reconnect detected, setting Dns_Res_webpa_reconnect reason for Reconnect\n");
 	 set_global_reconnect_reason("Dns_Res_webpa_reconnect");
 	 set_global_reconnect_status(true);
 						
@@ -558,7 +422,7 @@ int nopoll_connect (create_connection_ctx_t *ctx, int is_ipv6)

 int wait_connection_ready (create_connection_ctx_t *ctx)
 {
-  int wait_status = 0;
+  int wait_status;
  char *redirectURL = NULL;

  if(nopoll_conn_wait_for_status_until_connection_ready(get_global_conn(), 10, 
@@ -570,12 +434,12 @@ int wait_connection_ready (create_connection_ctx_t *ctx)
  if(wait_status == 307 || wait_status == 302 || wait_status == 303)    // only when there is a http redirect
  {
 	char *redirect_ptr = redirectURL;
-	ParodusInfo("Received temporary redirection response message %s\n", redirectURL);
+	ParodusError("Received temporary redirection response message %s\n", redirectURL);
 	// Extract server Address and port from the redirectURL
 	if (strncmp (redirect_ptr, "Redirect:", 9) == 0)
 	    redirect_ptr += 9;
-	free_server (&ctx->server_list->redirect);
-	if (parse_server_url (redirect_ptr, &ctx->server_list->redirect) < 0) {
+	free_server (&ctx->server_list.redirect);
+	if (parse_server_url (redirect_ptr, &ctx->server_list.redirect) < 0) {
 	  ParodusError ("Redirect url error %s\n", redirectURL);
  	  free (redirectURL);
 	  return WAIT_FAIL;
@@ -591,7 +455,6 @@ int wait_connection_ready (create_connection_ctx_t *ctx)
    /* clear auth token in cfg so that we will refetch auth token */
    memset (cfg->webpa_auth_token, 0, sizeof(cfg->webpa_auth_token));
    ParodusError("Received Unauthorized response with status: %d\n", wait_status);
-	OnboardLog("Received Unauthorized response with status: %d\n", wait_status);
    return WAIT_ACTION_RETRY;
  }
  ParodusError("Client connection timeout\n");	
@@ -604,7 +467,7 @@ int wait_connection_ready (create_connection_ctx_t *ctx)
 // Return codes for connect_and_wait
 #define CONN_WAIT_SUCCESS	 0
 #define CONN_WAIT_ACTION_RETRY	 1	// if wait_status is 307, 302, 303, or 403
-#define CONN_WAIT_FAIL 	 2
+#define CONN_WAIT_RETRY_DNS 	 2

 int connect_and_wait (create_connection_ctx_t *ctx)
 {
@@ -635,7 +498,7 @@ int connect_and_wait (create_connection_ctx_t *ctx)
    } // nopoll_connected
    
    if (nopoll_connected) {
-      close_and_unref_connection(get_global_conn(), false);
+	close_and_unref_connection(get_global_conn());
 	set_global_conn(NULL);
    }

@@ -648,7 +511,7 @@ int connect_and_wait (create_connection_ctx_t *ctx)
      continue;
    }
    
-    return CONN_WAIT_FAIL;
+    return CONN_WAIT_RETRY_DNS;
  }
 }

@@ -661,7 +524,7 @@ int keep_trying_to_connect (create_connection_ctx_t *ctx,
 {
    int rtn;
    
-    while (!g_shutdown)
+    while (true)
    {
      set_extra_headers (ctx);

@@ -671,52 +534,13 @@ int keep_trying_to_connect (create_connection_ctx_t *ctx,

      if (rtn == CONN_WAIT_ACTION_RETRY) // if redirected or build_headers
        continue;
-      // If interface down event is set, stop retry
-      // and wait till interface is up again.
-      if(get_interface_down_event()) {
-	    if (0 != wait_while_interface_down())
-	      return false;
-	    start_conn_in_progress(backoff_timer->start_time);
-	    ParodusInfo("Interface is back up, re-initializing the convey header\n");
-	    // Reset the reconnect reason by initializing the convey header again
-	    ((header_info_t *)(&ctx->header_info))->conveyHeader = getWebpaConveyHeader();
-	    ParodusInfo("Received reconnect_reason as:%s\n", reconnect_reason);  
-      } else { 
-        if (backoff_delay (backoff_timer) // 3,7,15,31 ..
-              != BACKOFF_DELAY_TAKEN) // shutdown or cond wait error
-          return false;
-      }
-      if (rtn == CONN_WAIT_FAIL) {
-        return false;
-      }
+      backoff_delay (backoff_timer); // 3,7,15,31 ..
+      if (rtn == CONN_WAIT_RETRY_DNS)
+        return false;  //find_server again
      // else retry
    }
-    return false;
 }

-int wait_while_interface_down()
-
-{
-	int rtn;
-	
-	ParodusError("Interface is down, hence waiting until its up\n");
-	close_and_unref_connection (get_global_conn(), false);
-	set_global_conn(NULL);
-
-	while (get_interface_down_event ()) {
-	  pthread_mutex_lock(get_interface_down_mut());
-  	  rtn = pthread_cond_wait(get_interface_down_con(), get_interface_down_mut());
-      pthread_mutex_unlock (get_interface_down_mut());
-  	  if (rtn != 0)
-  	    ParodusError 
-  	      ("Error on pthread_cond_wait (%d) in wait_while_interface_down\n", rtn);
-	  if (g_shutdown) {
-	    ParodusInfo("Received g_shutdown during interface down wait, returning\n");
-	    return -1;
-	  }
-	}
-    return 0;
-}

 //--------------------------------------------------------------------

@@ -724,13 +548,14 @@ int wait_while_interface_down()
 * @brief createNopollConnection interface to create WebSocket client connections.
 *Loads the WebPA config file and creates the intial connection and manages the connection wait, close mechanisms.
 */
-int createNopollConnection(noPollCtx *ctx, server_list_t *server_list)
+int createNopollConnection(noPollCtx *ctx)
 {
  create_connection_ctx_t conn_ctx;
  int max_retry_count;
+  int query_dns_status;
+  struct timespec connect_time,*connectTimePtr;
+  connectTimePtr = &connect_time;
  backoff_timer_t backoff_timer;
-  static int init_conn_failure=1;
-  struct sysinfo l_sSysInfo;
  
  if(ctx == NULL) {
        return nopoll_false;
@@ -747,73 +572,41 @@ int createNopollConnection(noPollCtx *ctx, server_list_t *server_list)
 	conn_ctx.nopoll_ctx = ctx;
 	init_expire_timer (&conn_ctx.connect_timer);
 	init_header_info (&conn_ctx.header_info);
-	/* look up server information if we don't already have it */
-	if (server_is_null (&server_list->defaults))
-	  if (find_servers (server_list) == FIND_INVALID_DEFAULT) {
-        return nopoll_false;		  
-      }
-	conn_ctx.server_list = server_list;
-    init_backoff_timer (&backoff_timer, max_retry_count);
-    start_conn_in_progress (backoff_timer.start_time); 
+        set_server_list_null (&conn_ctx.server_list);
+        init_backoff_timer (&backoff_timer, max_retry_count);
  
 	while (!g_shutdown)
 	{
+	  query_dns_status = find_servers (&conn_ctx.server_list);
+	  if (query_dns_status == FIND_INVALID_DEFAULT)
+		return nopoll_false;
 	  set_current_server (&conn_ctx);
-	  if (keep_trying_to_connect (&conn_ctx, &backoff_timer)) {
-		// Don't reuse the redirect server during reconnect
-		free_server (&conn_ctx.server_list->redirect);
+	  if (keep_trying_to_connect (&conn_ctx, &backoff_timer))
 		break;
-	  }
-	  /* if we failed to connect, don't reuse the redirect server */	
-      free_server (&conn_ctx.server_list->redirect);
-
-      /* On initial connect failure, invoke conn status change event as "failed" only 1 time*/
-      if((NULL != on_conn_status_change) && init && init_conn_failure)
-      {
-    	  on_conn_status_change("failed");
-	  init_conn_failure=0;
-      }
-
-#ifdef FEATURE_DNS_QUERY
-      /* if we don't already have a valid jwt, look up server information */
-      if (server_is_null (&conn_ctx.server_list->jwt))
-        if (find_servers (conn_ctx.server_list) == FIND_INVALID_DEFAULT) {
-		  /* since we already found a default server, we don't expect FIND_INVALID_DEFAULT */
-		  g_shutdown = true;
-	    }
-#endif		
+	  // retry dns query
 	}
-	if(conn_ctx.current_server != NULL && conn_ctx.current_server->allow_insecure <= 0)
+      
+	if(conn_ctx.current_server->allow_insecure <= 0)
 	{
 		ParodusInfo("Connected to server over SSL\n");
-		OnboardLog("Connected to server over SSL\n");
 	}
 	else 
 	{
 		ParodusInfo("Connected to server\n");
-		OnboardLog("Connected to server\n");
 	}
+	
+	get_parodus_cfg()->cloud_status = CLOUD_STATUS_ONLINE;
+	ParodusInfo("cloud_status set as %s after successful connection\n", get_parodus_cfg()->cloud_status);

-	/* On initial connect success, invoke conn status change event as "success" */
-	if((NULL != on_conn_status_change) && init)
-	{
-		on_conn_status_change("success");
-	}
-
-	// Invoke the ping status change event callback as "received" ping
-	if(NULL != on_ping_status_change)
-	{
-		on_ping_status_change("received");
-	}
-
-	if(init) {
-		sysinfo(&l_sSysInfo);
-		ParodusInfo("connect_time-diff-boot_time=%ld\n", l_sSysInfo.uptime);
+	if((get_parodus_cfg()->boot_time != 0) && init) {
+		getCurrentTime(connectTimePtr);
+		ParodusInfo("connect_time-diff-boot_time=%d\n", connectTimePtr->tv_sec - get_parodus_cfg()->boot_time);
 		init = 0; //set init to 0 so that this is logged only during process start up and not during reconnect
 	}

 	free_extra_headers (&conn_ctx);
-	free_header_info (&conn_ctx.header_info);
+        free_header_info (&conn_ctx.header_info);
+        free_server_list (&conn_ctx.server_list);
        
 	// Reset close_retry flag and heartbeatTimer once the connection retry is successful
 	ParodusPrint("createNopollConnection(): reset_close_retry\n");
@@ -823,10 +616,7 @@ int createNopollConnection(noPollCtx *ctx, server_list_t *server_list)
 	set_global_reconnect_status(false);
 	ParodusPrint("LastReasonStatus reset after successful connection\n");
 	setMessageHandlers();
-    stop_conn_in_progress ();
-	ParodusPrint("set cloud_status\n");
-	set_cloud_status(CLOUD_STATUS_ONLINE);
-	ParodusInfo("cloud_status set as %s after successful connection\n", get_cloud_status());
+
 	return nopoll_true;
 }          

@@ -871,52 +661,23 @@ static noPollConnOpts * createConnOpts (char * extra_headers, bool secure)
 	    nopoll_conn_opts_ssl_peer_verify (opts, nopoll_true);
 	    nopoll_conn_opts_set_ssl_protocol (opts, NOPOLL_METHOD_TLSV1_2);
 	}
-	nopoll_conn_opts_set_interface (opts,getWebpaInterface());	
+	nopoll_conn_opts_set_interface (opts,get_parodus_cfg()->webpa_interface_used);	
 	nopoll_conn_opts_set_extra_headers (opts,extra_headers); 
 	return opts;   
 }

-static void close_conn ( noPollConn *conn, bool is_shutting_down)
-{
-	const char *effective_reason = get_global_shutdown_reason();
-	
-	if (NULL == effective_reason) {
-          effective_reason = SHUTDOWN_REASON_SYSTEM_RESTART;
-    }
-    else if (strcmp (effective_reason, SHUTDOWN_REASON_SIGTERM) == 0) {
-		char *sigterm_reason;
-		char *reason_file = get_parodus_cfg()->close_reason_file;
-        if ((NULL != reason_file) && readFromFile (reason_file, &sigterm_reason) &&
-            (strlen(sigterm_reason) != 0)) 
-        {
-          nopoll_conn_close_ext(conn, CloseNormalClosure, sigterm_reason, 
-			strlen (sigterm_reason));
-		  ParodusInfo ("Closed by SIGTERM, reason: %s\n", sigterm_reason);
-		  if (is_shutting_down)
-            ParodusInfo ("shutdown reason at close %s\n", sigterm_reason); 
-		  free (sigterm_reason);
-		  return;
-		}
-		/* file could not be read. use canned message. */
-        effective_reason = SHUTDOWN_REASON_SYSTEM_RESTART;
-        ParodusError ("Closed by SIGTERM, but no reason file\n");
-    }
-    nopoll_conn_close_ext(conn, CloseNormalClosure, effective_reason, 
-      strlen (effective_reason)); 
-    if (is_shutting_down)
-      ParodusInfo ("shutdown reason at close %s\n", effective_reason); 
-}    		
-		
-void close_and_unref_connection(noPollConn *conn, bool is_shutting_down)
+
+void close_and_unref_connection(noPollConn *conn)
 {
    if (conn) {
-      close_conn (conn, is_shutting_down);
-      set_cloud_status(CLOUD_STATUS_OFFLINE);
-      ParodusInfo("cloud_status set as %s after connection close\n", get_cloud_status());
+        nopoll_conn_close(conn);
+        if (0 < nopoll_conn_ref_count (conn)) {
+            nopoll_conn_unref(conn);
+        }
    }
 }

-void write_conn_in_prog_file (bool is_starting, unsigned long start_time)
+void write_conn_in_prog_file (const char *msg)
 {
  int fd;
  FILE *fp;
@@ -937,32 +698,17 @@ void write_conn_in_prog_file (bool is_starting, unsigned long start_time)
    return;
  }
  timestamp = (unsigned long) time(NULL);
-  if (is_starting)
-    fprintf (fp, "{START=%lu,%lu}\n", start_time, timestamp);
-  else
-    fprintf (fp, "{STOP=%lu}\n", timestamp);
-  
+  fprintf (fp, "{%s=%lu}\n", msg, timestamp);
  fclose (fp);
 }

-void start_conn_in_progress (unsigned long start_time)
+void start_conn_in_progress (void)
 {
-  write_conn_in_prog_file (true, start_time);
+  write_conn_in_prog_file ("START");
 }   

 void stop_conn_in_progress (void)
 {
-  write_conn_in_prog_file (false, 0);
+  write_conn_in_prog_file ("STOP");
 }   

-
-void registerParodusOnPingStatusChangeHandler(parodusOnPingStatusChangeHandler callback_func)
-{
-	on_ping_status_change = callback_func;
-}
-
-void registerParodusOnConnStatusChangeHandler(parodusOnConnStatusChangeHandler callback_func)
-{
-	on_conn_status_change = callback_func;
-}
-
--- a/src/connection.h
+++ b/src/connection.h
@@ -33,46 +33,22 @@ extern "C" {
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
-#define SHUTDOWN_REASON_PARODUS_STOP    "parodus_stopping"
-#define SHUTDOWN_REASON_SYSTEM_RESTART  "system_restarting"
-#define SHUTDOWN_REASON_SIGTERM 		"SIGTERM"

-/**
-* parodusOnConnStatusChangeHandler - Function pointer
-* Used to define callback function to do additional processing
-* when websocket cloud connection status change event
-* i.e. "cloud-conn-status" as "fail" or "success"
-*/
-typedef void (*parodusOnConnStatusChangeHandler) (char * status);
-extern parodusOnConnStatusChangeHandler on_conn_status_change;
-
-/**
-* parodusOnPingStatusChangeHandler - Function pointer
-* Used to define callback function to do additional processing 
-* when websocket Ping status change event 
-* i.e. ping_miss or ping receive after miss
-*/
-typedef void (*parodusOnPingStatusChangeHandler) (char * status);
-extern parodusOnPingStatusChangeHandler on_ping_status_change;

 /*----------------------------------------------------------------------------*/
 /*                             Function Prototypes                            */
 /*----------------------------------------------------------------------------*/

-void set_server_list_null (server_list_t *server_list);
-int createNopollConnection(noPollCtx *, server_list_t *);
+int createNopollConnection(noPollCtx *);

 /**
 * @brief Interface to terminate WebSocket client connections and clean up resources.
 */
-void close_and_unref_connection(noPollConn *conn, bool is_shutting_down);
+void close_and_unref_connection(noPollConn *);

 noPollConn *get_global_conn(void);
 void set_global_conn(noPollConn *);

-char *get_global_shutdown_reason();
-void set_global_shutdown_reason(char *reason);
-
 char *get_global_reconnect_reason();
 void set_global_reconnect_reason(char *reason);

@@ -85,20 +61,9 @@ void set_cloud_disconnect_time(int disconnTime);
 /**
 * @brief Interface to self heal connection in progress getting stuck
 */
-void start_conn_in_progress (unsigned long start_time);
+void start_conn_in_progress (void);
 void stop_conn_in_progress (void);

-// To Register parodusOnConnStatusChangeHandler Callback function
-void registerParodusOnConnStatusChangeHandler(parodusOnConnStatusChangeHandler on_conn_status_change);
-
-// To Register parodusOnPingStatusChangeHandler Callback function
-void registerParodusOnPingStatusChangeHandler(parodusOnPingStatusChangeHandler on_ping_status_change);
-
-// To stop connection and wait duing interface down state
-int wait_while_interface_down (void);
-
-void terminate_backoff_delay (void);
-
 #ifdef __cplusplus
 }
 #endif
--- a/src/crud_internal.c
+++ b/src/crud_internal.c
@@ -26,9 +26,6 @@
 #include "config.h"
 #include "connection.h"
 #include "close_retry.h"
-#include "client_list.h"
-
-#define SERVICE_STATUS "service-status"

 static void freeObjArray(char *(*obj)[], int size);
 static int writeIntoCrudJson(cJSON *res_obj, char * object, cJSON *objValue, int freeFlag);
@@ -36,7 +33,6 @@ static int parse_dest_elements_to_string(wrp_msg_t *reqMsg, char *(*obj)[]);
 static char* strdupptr( const char *s, const char *e );
 static int ConnDisconnectFromCloud(char *reason);
 static int validateDisconnectString(char *reason);
-static int getClientStatus(char *service, cJSON **jsonresponse);

 int writeToJSON(char *data)
 {
@@ -62,7 +58,22 @@ int writeToJSON(char *data)

 int readFromJSON(char **data)
 {
-	return readFromFile (get_parodus_cfg()->crud_config_file, data);
+	FILE *fp;
+	int ch_count = 0;
+	fp = fopen(get_parodus_cfg()->crud_config_file, "r+");
+	if (fp == NULL)
+	{
+		ParodusError("Failed to open file %s\n", get_parodus_cfg()->crud_config_file);
+		return 0;
+	}
+	fseek(fp, 0, SEEK_END);
+	ch_count = ftell(fp);
+	fseek(fp, 0, SEEK_SET);
+	*data = (char *) malloc(sizeof(char) * (ch_count + 1));
+	fread(*data, 1, ch_count,fp);
+	(*data)[ch_count] ='\0';
+	fclose(fp);
+	return 1;
 }
 /*
 *	@res_obj 	json object to add it in crud config json file
@@ -537,13 +548,13 @@ int retrieveFromMemory(char *keyName, cJSON **jsonresponse)
 	}
 	else if(strcmp(WEBPA_INTERFACE, keyName)==0)
 	{
-		if((getWebpaInterface() !=NULL)&& (strlen(get_parodus_cfg()->fw_name)==0))
+		if((get_parodus_cfg()->webpa_interface_used !=NULL)&& (strlen(get_parodus_cfg()->fw_name)==0))
 		{
 			ParodusError("retrieveFromMemory: webpa_interface_used value is NULL\n");
 			return -1;
 		}
-		ParodusInfo("retrieveFromMemory: keyName:%s value:%s\n",keyName,getWebpaInterface());
-		cJSON_AddItemToObject( *jsonresponse, WEBPA_INTERFACE , cJSON_CreateString(getWebpaInterface()));
+		ParodusInfo("retrieveFromMemory: keyName:%s value:%s\n",keyName,get_parodus_cfg()->webpa_interface_used);
+		cJSON_AddItemToObject( *jsonresponse, WEBPA_INTERFACE , cJSON_CreateString(get_parodus_cfg()->webpa_interface_used));
 	}
 	else if(strcmp(WEBPA_URL, keyName)==0)
 	{
@@ -577,20 +588,20 @@ int retrieveFromMemory(char *keyName, cJSON **jsonresponse)
 	}
 	else if(strcmp(CLOUD_STATUS, keyName)==0)
 	{
-		if(get_cloud_status() ==NULL)
+		if(get_parodus_cfg()->cloud_status ==NULL)
 		{
 			ParodusError("retrieveFromMemory: cloud_status value is NULL\n");
 			return -1;
 		}
-		else if((get_cloud_status() !=NULL) && (strlen(get_cloud_status())==0))
+		else if((get_parodus_cfg()->cloud_status !=NULL) && (strlen(get_parodus_cfg()->cloud_status)==0))
 		{
 			ParodusError("retrieveFromMemory: cloud_status value is empty\n");
 			return -1;
 		}
 		else
 		{
-			ParodusInfo("retrieveFromMemory: keyName:%s value:%s\n", keyName, get_cloud_status());
-			cJSON_AddItemToObject( *jsonresponse, CLOUD_STATUS , cJSON_CreateString(get_cloud_status()));
+			ParodusInfo("retrieveFromMemory: keyName:%s value:%s\n", keyName, get_parodus_cfg()->cloud_status);
+			cJSON_AddItemToObject( *jsonresponse, CLOUD_STATUS , cJSON_CreateString(get_parodus_cfg()->cloud_status));
 		}
 	}
 	else if(strcmp(BOOT_TIME, keyName)==0)
@@ -643,17 +654,10 @@ int retrieveObject( wrp_msg_t *reqMsg, wrp_msg_t **response )
 		}

 		ParodusInfo( "Number of object level %d\n", objlevel );
-		if((objlevel == 3 && ((obj[3] !=NULL) && strstr(obj[3] ,"tags") == NULL)) || (objlevel == 4 && ((obj[3] !=NULL) && strstr(obj[3] ,"service-status") != NULL)))
+
+		if(objlevel == 3 && ((obj[3] !=NULL) && strstr(obj[3] ,"tags") == NULL))
 		{
-			//To support dest "mac:14xxxxxxxxxx/parodus/service-status/service" to retrieve online/offline status of registered clients.
-			if(strstr(obj[3] ,"service-status") !=NULL)
-			{
-				inMemStatus = getClientStatus(obj[4], &inMemResponse );
-			}
-			else
-			{
-				inMemStatus = retrieveFromMemory(obj[3], &inMemResponse );
-			}
+			inMemStatus = retrieveFromMemory(obj[3], &inMemResponse );

 			if(inMemStatus == 0)
 			{
@@ -1342,7 +1346,6 @@ static int ConnDisconnectFromCloud(char *disconn_reason)
 	if(!close_retry)
 	{
 		ParodusInfo("Reconnect detected, setting reason %s for Reconnect\n", disconn_reason);
-		OnboardLog("Reconnect detected, setting reason %s for Reconnect\n", disconn_reason);
 		set_global_reconnect_reason(disconn_reason);
 		set_global_reconnect_status(true);
 		set_close_retry();
@@ -1624,27 +1627,3 @@ static int validateDisconnectString(char *reason)
 	}
 	return rv;
 }
-
-static int getClientStatus(char *service, cJSON **jsonresponse)
-{
-	char regstatus[16] ={0};
-	*jsonresponse = cJSON_CreateObject();
-
-	if(service == NULL)
-	{
-		ParodusError("service is NULL\n");
-		return -1;
-	}
-
-	if(checkClientStatus(service))
-	{
-		strncpy(regstatus, "online", sizeof(regstatus)-1);
-	}
-	else
-	{
-		strncpy(regstatus, "offline", sizeof(regstatus)-1);
-	}
-	ParodusPrint("getClientStatus: service:%s value:%s\n", service, regstatus);
-	cJSON_AddItemToObject( *jsonresponse, SERVICE_STATUS , cJSON_CreateString(regstatus));
-	return 0;
-}
--- a/src/downstream.c
+++ b/src/downstream.c
@@ -27,9 +27,6 @@
 #include "partners_check.h"
 #include "ParodusInternal.h"
 #include "crud_interface.h"
-#ifdef ENABLE_WEBCFGBIN
-#include "xmidtsend_rbus.h"
-#endif
 /*----------------------------------------------------------------------------*/
 /*                             Function Prototypes                            */
 /*----------------------------------------------------------------------------*/
@@ -94,7 +91,6 @@ void listenerOnMessage(void * msg, size_t msgSize)
                {
                    ParodusPrint("numOfClients registered is %d\n", get_numOfClients());
                    int ret = validate_partner_id(message, NULL);
-		    ParodusPrint("validate_partner_id returns %d\n", ret);
                    if(ret < 0)
                    {
                        response = cJSON_CreateObject();
@@ -102,6 +98,7 @@ void listenerOnMessage(void * msg, size_t msgSize)
                        cJSON_AddStringToObject(response, "message", "Invalid partner_id");
                    } 

+                      
                    destVal = strdup(((WRP_MSG_TYPE__EVENT == msgType) ? message->u.event.dest : 
                              ((WRP_MSG_TYPE__REQ   == msgType) ? message->u.req.dest : message->u.crud.dest)));

@@ -123,10 +120,7 @@ void listenerOnMessage(void * msg, size_t msgSize)
 						}
                        ParodusInfo("Received downstream dest as :%s and transaction_uuid :%s\n", dest, 
                            ((WRP_MSG_TYPE__REQ   == msgType) ? message->u.req.transaction_uuid : 
-                            ((WRP_MSG_TYPE__EVENT == msgType) ? message->u.event.transaction_uuid : message->u.crud.transaction_uuid)));
-			OnboardLog("%s\n",
-                            ((WRP_MSG_TYPE__REQ   == msgType) ? message->u.req.transaction_uuid :
-                            ((WRP_MSG_TYPE__EVENT == msgType) ? message->u.event.transaction_uuid : message->u.crud.transaction_uuid)));
+                            ((WRP_MSG_TYPE__EVENT == msgType) ? "NA" : message->u.crud.transaction_uuid)));
                        
                        free(destVal);

@@ -171,16 +165,13 @@ void listenerOnMessage(void * msg, size_t msgSize)
 							destFlag =1;
 			}
 			//if any unknown dest received sending error response to server
-			if (WRP_MSG_TYPE__EVENT != msgType)
-			{
-		                if(destFlag ==0)
-		                {
-		                    ParodusError("Unknown dest:%s\n", dest);
-		                    response = cJSON_CreateObject();
-		                    cJSON_AddNumberToObject(response, "statusCode", 531);
-		                    cJSON_AddStringToObject(response, "message", "Service Unavailable");
-		                }
-			}
+                        if(destFlag ==0)
+                        {
+                            ParodusError("Unknown dest:%s\n", dest);
+                            response = cJSON_CreateObject();
+                            cJSON_AddNumberToObject(response, "statusCode", 531);
+                            cJSON_AddStringToObject(response, "message", "Service Unavailable");
+                        }
                    }

                    if( (WRP_MSG_TYPE__EVENT != msgType) &&
@@ -241,37 +232,6 @@ void listenerOnMessage(void * msg, size_t msgSize)
                        }
                        free(resp_msg);
                    }
-		    #ifdef ENABLE_WEBCFGBIN
-		    //To handle cloud ack events received from server for the xmidt sent messages.
-		    if((WRP_MSG_TYPE__EVENT == msgType) && (ret >= 0))
-		    {
-			if(get_parodus_cfg()->max_queue_size > 0)
-			{
-				//Process cloud ack only when qos > 24
-				if(highQosValueCheck(message->u.event.qos))
-				{
-					if(message->u.event.transaction_uuid !=NULL)
-					{
-						ParodusInfo("Received cloud ack from server: transaction_uuid %s qos %d, rdr %d source %s\n", message->u.event.transaction_uuid, message->u.event.qos, message->u.event.rdr, message->u.event.source);
-						addToCloudAckQ(message->u.event.transaction_uuid, message->u.event.qos, message->u.event.rdr, message->u.event.source);
-						ParodusPrint("Added to cloud ack Q\n");
-					}
-					else
-					{
-						ParodusError("cloud ack transaction id is NULL\n");
-					}
-				}
-				else
-				{
-					ParodusInfo("cloud ack received with low qos %d, ignoring it\n", message->u.event.qos);
-				}
-			}
-			else
-			{
-				ParodusInfo("cloud ack is ignored as max queue size is %d\n", get_parodus_cfg()->max_queue_size );
-			}
-		    }
-		    #endif
                    break;
                }

--- a/src/event_handler.c
+++ b/src/event_handler.c
@@ -1,26 +0,0 @@
-/*
- * If not stated otherwise in this file or this component's Licenses.txt file the
- * following copyright and licenses apply:
- *
- * Copyright 2016 RDK Management
- * Copyright [2014] [Cisco Systems, Inc.]
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
-*/
-
-/* This is a stub file that will be overridden in a patch */
-
-#include "event_handler.h"
-
-void EventHandler()
-{
-}
--- a/src/event_handler.h
+++ b/src/event_handler.h
@@ -1,21 +0,0 @@
-/*
- * If not stated otherwise in this file or this component's Licenses.txt file the
- * following copyright and licenses apply:
- *
- * Copyright 2016 RDK Management
- * Copyright [2014] [Cisco Systems, Inc.]
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
-*/
-
-void EventHandler();
-#define LOGGING_INTERVAL_SECS    ( 60 * 60 )
--- a/src/heartBeat.c
+++ b/src/heartBeat.c
@@ -22,15 +22,10 @@
 */

 #include "heartBeat.h"
-#include "time.h"
-#include <stdbool.h>

 volatile unsigned int heartBeatTimer = 0;
-volatile bool paused = false;
-volatile long long pingTimeStamp = 0;

 pthread_mutex_t heartBeat_mut=PTHREAD_MUTEX_INITIALIZER;
-pthread_mutex_t ping_mut=PTHREAD_MUTEX_INITIALIZER;

 // Get value of heartBeatTimer
 unsigned int get_heartBeatTimer() 
@@ -54,44 +49,8 @@ void reset_heartBeatTimer()
 void increment_heartBeatTimer(unsigned int inc_time_ms) 
 {
 	pthread_mutex_lock (&heartBeat_mut);
-	if (!paused)
-	  heartBeatTimer += inc_time_ms;
+	heartBeatTimer += inc_time_ms;
 	pthread_mutex_unlock (&heartBeat_mut);
 }

-// Pause heartBeatTimer, i.e. stop incrementing
-void pause_heartBeatTimer()
-{
-	pthread_mutex_lock (&heartBeat_mut);
-	heartBeatTimer = 0;
-	paused = true;
-	pthread_mutex_unlock (&heartBeat_mut);
-}

-// Resume heartBeatTimer, i.e. resume incrementing
-void resume_heartBeatTimer()
-{
-	pthread_mutex_lock (&heartBeat_mut);
-	paused = false;
-	pthread_mutex_unlock (&heartBeat_mut);
-}
-
-// Set ping received timeStamp
-void set_pingTimeStamp()
-{
-	struct timespec ts;
-	getCurrentTime(&ts);
-	pthread_mutex_lock (&ping_mut);
-	pingTimeStamp = (long long)ts.tv_sec;
-	pthread_mutex_unlock (&ping_mut);
-}
-
-// Get ping received timeStamp
-long long get_pingTimeStamp()
-{
-	long long tmp = 0;
-	pthread_mutex_lock (&ping_mut);
-	tmp = pingTimeStamp;
-	pthread_mutex_unlock (&ping_mut);
-	return tmp;
-}
--- a/src/heartBeat.h
+++ b/src/heartBeat.h
@@ -39,16 +39,6 @@ void reset_heartBeatTimer();
 // Increment value of heartBeatTimer to desired value
 void increment_heartBeatTimer(unsigned int inc_time_ms);

-// Pause heartBeatTimer, i.e. stop incrementing
-void pause_heartBeatTimer();
-
-// Resume heartBeatTimer, i.e. resume incrementing
-void resume_heartBeatTimer();
-
-void set_pingTimeStamp();
-
-long long get_pingTimeStamp();
-
 #ifdef __cplusplus
 }
 #endif
--- a/src/main.c
+++ b/src/main.c
@@ -19,19 +19,14 @@
 #include "stdlib.h"
 #include "config.h"
 #include "auth_token.h"
-#include "connection.h"
 #include "conn_interface.h"
 #include "parodus_log.h"
 #include <curl/curl.h>
 #ifdef INCLUDE_BREAKPAD
-#ifndef DEVICE_CAMERA
 #include "breakpad_wrapper.h"
 #else
-#include "breakpadwrap.h"
-#endif  //DEVICE_CAMERA
-#endif
 #include "signal.h"
-#include "privilege.h"
+#endif

 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */
@@ -41,89 +36,48 @@
 /*----------------------------------------------------------------------------*/
 /*                               Data Structures                              */
 /*----------------------------------------------------------------------------*/
-typedef    void    Sigfunc(int);
+/* none */

 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
-int numLoops;
+/* none */

 /*----------------------------------------------------------------------------*/
 /*                             Function Prototypes                            */
 /*----------------------------------------------------------------------------*/
+#ifndef INCLUDE_BREAKPAD
 static void sig_handler(int sig);
-
-Sigfunc *
-signal (int signo, Sigfunc *func)
-{
-    struct sigaction act, oact;
-
-    act.sa_handler = func;
-    sigemptyset (&act.sa_mask);
-    act.sa_flags = 0;
-    if (signo == SIGALRM) {
-#ifdef  SA_INTERRUPT
-        act.sa_flags |= SA_INTERRUPT;     /* SunOS 4.x */
 #endif
-    } else {
-#ifdef  SA_RESTART
-        act.sa_flags |= SA_RESTART; /* SVR4, 4.4BSD */
-#endif
-    }
-    if (sigaction (signo, &act, &oact) < 0) {
-	ParodusError ("Signal Handler for signal %d not installed!\n", signo);
-        return (SIG_ERR);
-    }
-    return (oact.sa_handler);
-}

 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
 int main( int argc, char **argv)
 {
-    set_global_shutdown_reason (SHUTDOWN_REASON_PARODUS_STOP);
-    signal(SIGTERM, sig_handler);
-    signal(SIGINT, sig_handler);
-	signal(SIGUSR1, sig_handler);
-	signal(SIGUSR2, sig_handler);
-	signal(SIGQUIT, sig_handler);
-	signal(SIGHUP, sig_handler);   
-	signal(SIGALRM, sig_handler);
 #ifdef INCLUDE_BREAKPAD
-#ifndef DEVICE_CAMERA
-    /* breakpad handles the signals SIGSEGV, SIGBUS, SIGFPE, and SIGILL */
    breakpad_ExceptionHandler();
 #else
-    /* breakpad handles the signals SIGSEGV, SIGBUS, SIGFPE, and SIGILL */
-    BreakPadWrapExceptionHandler eh;
-    eh = newBreakPadWrapExceptionHandler();
-    if(NULL != eh) {
-        ParodusInfo("Breakpad Initialized\n");
-    }
-#endif //DEVICE_CAMERA
-#else
+    signal(SIGTERM, sig_handler);
+	signal(SIGINT, sig_handler);
+	signal(SIGUSR1, sig_handler);
+	signal(SIGUSR2, sig_handler);
 	signal(SIGSEGV, sig_handler);
 	signal(SIGBUS, sig_handler);
+	signal(SIGKILL, sig_handler);
 	signal(SIGFPE, sig_handler);
 	signal(SIGILL, sig_handler);
+	signal(SIGQUIT, sig_handler);
+	signal(SIGHUP, sig_handler);
+	signal(SIGALRM, sig_handler);
 #endif	
    ParodusCfg *cfg;

-	ParodusInfo ("RAND_MAX is %ld (0x%lx)\n", RAND_MAX, RAND_MAX);
-	srandom (getpid());
-
    /* TODO not ideal, but it fixes a more major problem for now. */
    cfg = get_parodus_cfg();
    memset(cfg,0,sizeof(ParodusCfg));
    
    ParodusInfo("********** Starting component: Parodus **********\n "); 
-    drop_root_privilege();
-    #ifdef ENABLE_WEBCFGBIN
-    registerRbusLogger();
-    subscribeRBUSevent();
-    regXmidtSendDataMethod();
-    #endif
    setDefaultValuesToCfg(cfg);
    if (0 != parseCommandLine(argc,argv,cfg)) {
 		abort();
@@ -131,7 +85,7 @@ int main( int argc, char **argv)
    curl_global_init(CURL_GLOBAL_DEFAULT);
     
    createSocketConnection( NULL);
-    free_cfg(cfg);
+    
    return 0;
 }

@@ -143,6 +97,7 @@ const char *rdk_logger_module_fetch(void)
 /*----------------------------------------------------------------------------*/
 /*                             Internal functions                             */
 /*----------------------------------------------------------------------------*/
+#ifndef INCLUDE_BREAKPAD
 static void sig_handler(int sig)
 {

@@ -150,25 +105,17 @@ static void sig_handler(int sig)
 	{
 		signal(SIGINT, sig_handler); /* reset it to this function */
 		ParodusInfo("SIGINT received!\n");
-		shutdownSocketConnection(SHUTDOWN_REASON_PARODUS_STOP);
+		shutdownSocketConnection();
 	}
 	else if ( sig == SIGUSR1 ) 
 	{
 		signal(SIGUSR1, sig_handler); /* reset it to this function */
 		ParodusInfo("SIGUSR1 received!\n");
-		shutdownSocketConnection(SHUTDOWN_REASON_SYSTEM_RESTART);
 	}
 	else if ( sig == SIGUSR2 ) 
 	{
-		signal(SIGUSR2, sig_handler); /* reset it to this function */
 		ParodusInfo("SIGUSR2 received!\n");
 	}
-	else if ( sig == SIGTERM ) 
-	{
-		signal(SIGTERM, sig_handler); /* reset it to this function */
-		ParodusInfo("SIGTERM received!\n");
-		shutdownSocketConnection(SHUTDOWN_REASON_SIGTERM);
-	}
 	else if ( sig == SIGCHLD ) 
 	{
 		signal(SIGCHLD, sig_handler); /* reset it to this function */
@@ -187,7 +134,8 @@ static void sig_handler(int sig)
 	else 
 	{
 		ParodusInfo("Signal %d received!\n", sig);
-		shutdownSocketConnection(SHUTDOWN_REASON_PARODUS_STOP);
+		shutdownSocketConnection();
 	}
 	
 }
+#endif
--- a/src/networking.c
+++ b/src/networking.c
@@ -70,7 +70,6 @@ int checkHostIp(char * serverIP)
 	if (retVal != 0) 
 	{
 		ParodusError("getaddrinfo: %s\n", gai_strerror(retVal));
-		OnboardLog("getaddrinfo: %s\n", gai_strerror(retVal));
 	}
 	else
 	{
--- a/src/nopoll_handlers.c
+++ b/src/nopoll_handlers.c
@@ -149,7 +149,6 @@ void listenerOnPingMessage (noPollCtx * ctx, noPollConn * conn, noPollMsg * msg,
        if (nopoll_msg_opcode(msg) == NOPOLL_PING_FRAME) 
        {
            reset_heartBeatTimer();
-	    set_pingTimeStamp();
        }
    }
 }
@@ -168,25 +167,16 @@ void listenerOnCloseMessage (noPollCtx * ctx, noPollConn * conn, noPollPtr user_
    if( closeStatus == 1006 && !get_global_reconnect_status())
    {
 	ParodusInfo("Reconnect detected, setting default Reconnect reason %s\n",defaultReason);
-	OnboardLog("Reconnect detected, setting default Reconnect reason %s\n",defaultReason);
        set_global_reconnect_reason(defaultReason);
        set_global_reconnect_status(true);
    }
    else if(!get_global_reconnect_status())
    {
    	ParodusInfo("Reconnect detected, setting Reconnect reason as Unknown\n");
-	OnboardLog("Reconnect detected, setting Reconnect reason as Unknown\n");
        set_global_reconnect_reason("Unknown");
    }
-    
-    if(!get_interface_down_event())
-    {
-	ParodusInfo("Setting the close and retry connection\n");
-    	set_close_retry();
-    }
-    else
-    	ParodusInfo("Not Setting the close and retry connection as interface is down\n");

+    set_close_retry();
    ParodusPrint("listenerOnCloseMessage(): mutex unlock in producer thread\n");
 }

--- a/src/nopoll_helpers.c
+++ b/src/nopoll_helpers.c
@@ -26,7 +26,6 @@
 #include "nopoll_helpers.h"
 #include "nopoll_handlers.h"
 #include "time.h"
-#include "config.h"

 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */
@@ -50,36 +49,50 @@ void setMessageHandlers()
    nopoll_conn_set_on_close(get_global_conn(), (noPollOnCloseHandler)listenerOnCloseMessage, NULL);
 }

-int cloud_status_is_online (void)
-{
-	const char *status = get_cloud_status();
-	if (NULL == status)
-	  return false;
-	return (strcmp (status, CLOUD_STATUS_ONLINE) == 0);
-}
-
 /** To send upstream msgs to server ***/

-int sendMessage(noPollConn *conn, void *msg, size_t len)
+void sendMessage(noPollConn *conn, void *msg, size_t len)
 {
    int bytesWritten = 0;
-
-    if (!cloud_status_is_online ()) {
-        ParodusError("Failed to send msg upstream as connection is not OK\n");
-        OnboardLog("Failed to send msg upstream as connection is not OK\n");
-		return 1;
-	}
+    static int connErr=0;
+    long timeDiff = 0;

    ParodusInfo("sendMessage length %zu\n", len);

-    bytesWritten = sendResponse(conn, msg, len);
-    ParodusPrint("Number of bytes written: %d\n", bytesWritten);
-    if (bytesWritten != (int) len) 
+    if(nopoll_conn_is_ok(conn) && nopoll_conn_is_ready(conn))
    {
-        ParodusError("Failed to send bytes %zu, bytes written were=%d (errno=%d, %s)..\n", len, bytesWritten, errno, strerror(errno));
-	return 1;
+        //bytesWritten = nopoll_conn_send_binary(conn, msg, len);
+        bytesWritten = sendResponse(conn, msg, len);
+        ParodusPrint("Number of bytes written: %d\n", bytesWritten);
+        if (bytesWritten != (int) len) 
+        {
+            ParodusError("Failed to send bytes %zu, bytes written were=%d (errno=%d, %s)..\n", len, bytesWritten, errno, strerror(errno));
+        }
+	connErr = 0;
+    }
+    else
+    {
+                ParodusError("Failed to send msg upstream as connection is not OK\n");
+		if (connErr == 0)
+		{
+			getCurrentTime(connStuck_startPtr);
+			ParodusInfo("Conn got stuck, initialized the first timer\n");
+			connErr = 1;
+		}
+		else
+		{
+			getCurrentTime(connStuck_endPtr);
+			timeDiff = timeValDiff(connStuck_startPtr, connStuck_endPtr);
+			ParodusPrint("checking timeout difference:%ld\n", timeDiff);
+
+			if( timeDiff >= (10*60*1000))
+			{
+				ParodusError("conn got stuck for over 10 minutes; crashing service.\n");
+				kill(getpid(),SIGTERM);
+			}
+
+		}
    }
-	return 0;
 }

 int sendResponse(noPollConn * conn, void * buffer, size_t length)
@@ -136,7 +149,6 @@ void __report_log (noPollCtx * ctx, noPollDebugLevel level, const char * log_msg
    if (level == NOPOLL_LEVEL_CRITICAL) 
    {
        ParodusError("%s\n", log_msg );
-	OnboardLog("%s\n", log_msg );
    }
    return;
 }
--- a/src/nopoll_helpers.h
+++ b/src/nopoll_helpers.h
@@ -41,7 +41,7 @@ extern "C" {
 */
 int sendResponse(noPollConn * conn,void *str, size_t bufferSize);
 void setMessageHandlers();
-int sendMessage(noPollConn *conn, void *msg, size_t len);
+void sendMessage(noPollConn *conn, void *msg, size_t len);

 /**
 * @brief __report_log Nopoll log handler 
--- a/src/parodus_log.h
+++ b/src/parodus_log.h
@@ -33,9 +33,3 @@
 #define ParodusError(...)                   cimplog_error(LOGGING_MODULE, __VA_ARGS__)
 #define ParodusInfo(...)                    cimplog_info(LOGGING_MODULE, __VA_ARGS__)
 #define ParodusPrint(...)                   cimplog_debug(LOGGING_MODULE, __VA_ARGS__)
-#ifdef FEATURE_SUPPORT_ONBOARD_LOGGING
-#define OnboardLog(...)                     onboarding_log(LOGGING_MODULE, __VA_ARGS__)
-#else
-#define OnboardLog(...)
-#endif
-
--- a/src/partners_check.c
+++ b/src/partners_check.c
@@ -114,7 +114,7 @@ int validate_partner_id(wrp_msg_t *msg, partners_t **partnerIds)
                }

                /* Commandline input partner_ids not matching with partner_ids from request, appending to request partner_ids*/
-                if(matchFlag != 1 && partnerIds !=NULL)
+                if(matchFlag != 1)
                {
                    (*partnerIds) = (partners_t *) malloc(sizeof(partners_t) + (sizeof(char *) * (count+partnersList->count)));
                    (*partnerIds)->count = count+partnersList->count;
@@ -132,23 +132,6 @@ int validate_partner_id(wrp_msg_t *msg, partners_t **partnerIds)
                        i++;
                    }
                }
-		else if (matchFlag != 1 && partnerIds == NULL)
-		{
-			ParodusError("partner_id match not found: command line input %s , msg partner_id %s\n", temp, msg->u.event.partner_ids->partner_ids[0]);
-			if(partnersList != NULL)
-			{
-				for(j=0; j<partnersList->count; j++)
-				{
-					if(NULL != partnersList->partner_ids[j])
-					{
-						free(partnersList->partner_ids[j]);
-					}
-				}
-				free(partnersList);
-			}
-			free(partnerId);
-			return 1;
-		}
            }
            else
            {
@@ -195,7 +178,6 @@ int validate_partner_id(wrp_msg_t *msg, partners_t **partnerIds)
                if(matchFlag != 1)
                {
                    ParodusError("Invalid partner_id %s\n",temp);
-                    OnboardLog("Invalid partner_id %s\n",temp);
                    if(partnersList != NULL)
                    {
                        for(j=0; j<partnersList->count; j++)
--- a/src/privilege.c
+++ b/src/privilege.c
@@ -1,6 +0,0 @@
-#include "privilege.h"
-
-void drop_root_privilege()
-{
-
-}
--- a/src/privilege.h
+++ b/src/privilege.h
@@ -1,2 +0,0 @@
-/* This is a stub function that will be overridden in a patch */
-void drop_root_privilege();
--- a/src/time.c
+++ b/src/time.c
@@ -17,7 +17,6 @@

 #include "time.h"
 #include "parodus_log.h"
-#include <errno.h>

 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
@@ -25,10 +24,7 @@

 void getCurrentTime(struct timespec *timer)
 {
-	if( clock_gettime(CLOCK_REALTIME, timer) == -1 )
-	{
-		ParodusError("clock gettime returns errno %d\n", errno );
-	}
+	clock_gettime(CLOCK_REALTIME, timer);
 }

 uint64_t getCurrentTimeInMicroSeconds(struct timespec *timer)
@@ -38,7 +34,7 @@ uint64_t getCurrentTimeInMicroSeconds(struct timespec *timer)
    ParodusPrint("timer->tv_sec : %lu\n",timer->tv_sec);
    ParodusPrint("timer->tv_nsec : %lu\n",timer->tv_nsec);
    systime = (uint64_t)timer->tv_sec * 1000000L + timer->tv_nsec/ 1000;
-    return systime;
+    return systime;	
 }

 long timeValDiff(struct timespec *starttime, struct timespec *finishtime)
--- a/src/token.c
+++ b/src/token.c
@@ -139,7 +139,6 @@ int analyze_jwt (const cjwt_t *jwt, char **url_buf, unsigned int *port)
 		show_times (exp_time, cur_time);
 		if (exp_time < cur_time) {
 			ParodusError ("JWT has expired\n");
-			OnboardLog ("JWT has expired\n");
 			return TOKEN_ERR_JWT_EXPIRED;
 		}
 	}
@@ -147,7 +146,6 @@ int analyze_jwt (const cjwt_t *jwt, char **url_buf, unsigned int *port)
 		url_buf, port);
 	if (http_match < 0) {
 		ParodusError ("Invalid endpoint claim in JWT\n");
-		OnboardLog("Invalid endpoint claim in JWT\n");
 		return TOKEN_ERR_BAD_ENDPOINT;
 	}
 	ParodusInfo ("JWT is_http strncmp: %d\n", http_match);
--- a/src/upstream.c
+++ b/src/upstream.c
@@ -40,7 +40,7 @@
 /*----------------------------------------------------------------------------*/

 void *metadataPack;
-size_t metaPackSize=0;
+size_t metaPackSize=-1;


 UpStreamMsg *UpStreamMsgQ = NULL;
@@ -83,6 +83,7 @@ void packMetaData()
    //Pack the metadata initially to reuse for every upstream msg sending to server
    ParodusPrint("-------------- Packing metadata ----------------\n");
    sprintf(boot_time, "%d", get_parodus_cfg()->boot_time);
+
    struct data meta_pack[METADATA_COUNT] = {
            {HW_MODELNAME, get_parodus_cfg()->hw_model},
            {HW_SERIALNUMBER, get_parodus_cfg()->hw_serial_number},
@@ -94,9 +95,10 @@ void packMetaData()
            {LAST_RECONNECT_REASON, get_global_reconnect_reason()},
            {WEBPA_PROTOCOL, get_parodus_cfg()->webpa_protocol},
            {WEBPA_UUID,get_parodus_cfg()->webpa_uuid},
-            {WEBPA_INTERFACE, getWebpaInterface()},
+            {WEBPA_INTERFACE, get_parodus_cfg()->webpa_interface_used},
            {PARTNER_ID, get_parodus_cfg()->partner_id}
        };
+
    const data_t metapack = {METADATA_COUNT, meta_pack};

    metaPackSize = wrp_pack_metadata( &metapack , &metadataPack );
@@ -110,11 +112,6 @@ void packMetaData()
 	    ParodusError("Failed to encode metadata\n");
    }
 }
-
-void clear_metadata(){
-    if(metadataPack != NULL)
-         free(metadataPack);
-}
       
 /*
 * @brief To handle UpStream messages which is received from nanomsg server socket
@@ -325,10 +322,7 @@ void *processUpstreamMessage()
                }
                else if(msgType == WRP_MSG_TYPE__EVENT)
                {
-                    (msg->u.event.headers != NULL && msg->u.event.headers->headers[0] != NULL && msg->u.event.headers->headers[1] != NULL) ? ParodusInfo(" Received upstream event data: dest '%s' traceParent: %s traceState: %s\n", msg->u.event.dest, msg->u.event.headers->headers[0], msg->u.event.headers->headers[1]) : ParodusInfo(" Received upstream event data: dest '%s'\n", msg->u.event.dest);
-		    if(msg->u.event.transaction_uuid != NULL) {
-			    ParodusInfo("transaction_uuid in event: %s\n", msg->u.event.transaction_uuid);
-		    }	    
+                    ParodusInfo(" Received upstream event data: dest '%s'\n", msg->u.event.dest);
                    partners_t *partnersList = NULL;
                    int j = 0;

@@ -336,7 +330,6 @@ void *processUpstreamMessage()
                    if(ret == 1)
                    {
                        wrp_msg_t *eventMsg = (wrp_msg_t *) malloc(sizeof(wrp_msg_t));
-			memset( eventMsg, 0, sizeof( wrp_msg_t ) );
                        eventMsg->msg_type = msgType;
                        eventMsg->u.event.content_type=msg->u.event.content_type;
                        eventMsg->u.event.source=msg->u.event.source;
@@ -346,15 +339,6 @@ void *processUpstreamMessage()
                        eventMsg->u.event.headers=msg->u.event.headers;
                        eventMsg->u.event.metadata=msg->u.event.metadata;
                        eventMsg->u.event.partner_ids = partnersList;
-			if(msg->u.event.transaction_uuid)
-			{
-				ParodusPrint("Inside Trans id in PARODUS\n");
-			}
-			else
-			{
-				ParodusPrint("Assigning NULL to trans id\n");
-				eventMsg->u.event.transaction_uuid = NULL;
-			}

                        int size = wrp_struct_to( eventMsg, WRP_BYTES, &bytes );
                        if(size > 0)
@@ -387,7 +371,7 @@ void *processUpstreamMessage()
 					//Sending to server for msgTypes 3, 5, 6, 7, 8.
 					if( WRP_MSG_TYPE__REQ == msgType )
 					{
-						(msg->u.req.headers != NULL && msg->u.req.headers->headers[0] != NULL && msg->u.req.headers->headers[1] != NULL) ? ParodusInfo(" Received upstream data with MsgType: %d dest: '%s' transaction_uuid: %s traceParent: %s traceState: %s\n", msgType, msg->u.req.dest, msg->u.req.transaction_uuid, msg->u.req.headers->headers[0], msg->u.req.headers->headers[1]) : ParodusInfo(" Received upstream data with MsgType: %d dest: '%s' transaction_uuid: %s\n", msgType, msg->u.req.dest, msg->u.req.transaction_uuid);
+						ParodusInfo(" Received upstream data with MsgType: %d dest: '%s' transaction_uuid: %s\n", msgType, msg->u.req.dest, msg->u.req.transaction_uuid );
 						sendUpstreamMsgToServer(&message->msg, message->len);
 					}
 					else
@@ -433,43 +417,12 @@ void *processUpstreamMessage()
 								{
 									ParodusError("Failed to get device_id\n");
 								}
-						}
-						else if((WRP_MSG_TYPE__UPDATE == msgType) || (WRP_MSG_TYPE__DELETE == msgType))
-						{
-							ParodusPrint("UPDATE/DELETE request\n");
-							ret = getDeviceId(&device_id, &device_id_len);
-							if(ret == 0)
-							{
-								ParodusPrint("device_id %s device_id_len %lu\n", device_id, device_id_len);
-								/* Match dest based on device_id. Check dest start with: "mac:112233445xxx" ? */
-								if( 0 == strncasecmp(device_id, msg->u.crud.dest, device_id_len-1) )
-								{
-									/* For this device. For nanomsg clients.*/
-									getServiceNameAndSendResponse(msg, &message->msg, message->len);
-								}
-								else
-								{
-									/* Not for this device. Send upstream */
-									ParodusInfo("sendUpstreamMsgToServer \n");
-									sendUpstreamMsgToServer(&message->msg, message->len);
-								}
-								if(device_id != NULL)
-								{
-									free(device_id);
-									device_id = NULL;
-								}
-							}
-							else
-							{
-								ParodusError("Failed to get device_id\n");
-							}
-						 }
-						 else if (WRP_MSG_TYPE__SVC_ALIVE != msgType) {
+						} else if (WRP_MSG_TYPE__SVC_ALIVE != msgType) {
 						  /* Don't reply to service alive message */
 							sendUpstreamMsgToServer(&message->msg, message->len);
+						}
 					}
-			  }
-		    }
+            	}
           	}
            else
            {
@@ -612,12 +565,11 @@ void getServiceNameAndSendResponse(wrp_msg_t *msg, void **msg_bytes, size_t msg_
 	}
 }

-int sendUpstreamMsgToServer(void **resp_bytes, size_t resp_size)
+void sendUpstreamMsgToServer(void **resp_bytes, size_t resp_size)
 {
 	void *appendData;
 	size_t encodedSize;
 	bool close_retry = false;
-	int sendRetStatus = 1;
 	//appending response with metadata 			
 	if(metaPackSize > 0)
 	{
@@ -632,13 +584,11 @@ int sendUpstreamMsgToServer(void **resp_bytes, size_t resp_size)
 		//TODO: Upstream and downstream messages in queue should be handled and queue should be empty before parodus forcefully disconnect from cloud.
 		if(!close_retry || (get_parodus_cfg()->cloud_disconnect !=NULL))
 		{
-			sendRetStatus = sendMessage(get_global_conn(),appendData, encodedSize);
+			sendMessage(get_global_conn(),appendData, encodedSize);
 		}
 		else
 		{
 			ParodusInfo("close_retry is %d, unable to send response as connection retry is in progress\n", close_retry);
-			OnboardLog("close_retry is %d, unable to send response as connection retry is in progress\n", close_retry);
-			sendRetStatus = 1;
 		}
 		free(appendData);
 		appendData =NULL;
@@ -646,9 +596,6 @@ int sendUpstreamMsgToServer(void **resp_bytes, size_t resp_size)
 	else
 	{		
 		ParodusError("Failed to send upstream as metadata packing is not successful\n");
-		sendRetStatus = 1;
 	}
-	ParodusPrint("sendRetStatus is %d\n", sendRetStatus);

-	return sendRetStatus;
 }
--- a/src/upstream.h
+++ b/src/upstream.h
@@ -47,19 +47,14 @@ typedef struct UpStreamMsg__
 void packMetaData();
 void *handle_upstream();
 void *processUpstreamMessage();
-void registerRBUSlistener();
 int getDeviceId(char **device_id, size_t *device_id_len);
-int sendUpstreamMsgToServer(void **resp_bytes, size_t resp_size);
+void sendUpstreamMsgToServer(void **resp_bytes, size_t resp_size);
 void getServiceNameAndSendResponse(wrp_msg_t *msg, void **msg_bytes, size_t msg_size);
 void createUpstreamRetrieveMsg(wrp_msg_t *message, wrp_msg_t **retrieve_msg);
 void set_global_UpStreamMsgQ(UpStreamMsg * UpStreamQ);
-#ifdef WAN_FAILOVER_SUPPORTED
-int subscribeCurrentActiveInterfaceEvent();
-#endif
 UpStreamMsg * get_global_UpStreamMsgQ(void);
 pthread_cond_t *get_global_nano_con(void);
 pthread_mutex_t *get_global_nano_mut(void);
-void clear_metadata();

 #ifdef __cplusplus
 }
--- a/src/upstream_rbus.c
+++ b/src/upstream_rbus.c
@@ -1,243 +0,0 @@
-/**
- * Copyright 2021 Comcast Cable Communications Management, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
- *
- */
-/**
- * @file upstream_rbus.c
- *
- * @description This is used for parodus-RBUS communication 
- * to send notification events upstream to cloud.
- *
- */
-
-#include <stdlib.h>
-#include <rbus.h>
-#include "upstream.h"
-#include "ParodusInternal.h"
-#include "partners_check.h"
-#include "close_retry.h"
-#include "connection.h"
-#include "heartBeat.h"
-
-#define WEBCFG_UPSTREAM_EVENT "Webconfig.Upstream"
-#ifdef WAN_FAILOVER_SUPPORTED
-#define WEBPA_INTERFACE "Device.X_RDK_WanManager.CurrentActiveInterface"
-#endif
-
-rbusHandle_t rbus_Handle;
-rbusError_t err;
-
-void processWebconfigUpstreamEvent(rbusHandle_t handle, rbusEvent_t const* event, rbusEventSubscription_t* subscription);
-
-void subscribeAsyncHandler( rbusHandle_t handle, rbusEventSubscription_t* subscription, rbusError_t error);
-
-rbusHandle_t get_parodus_rbus_Handle(void)
-{
-     return rbus_Handle;
-}
-
-/* Enables rbus ERROR level logs in parodus. Modify RBUS_LOG_ERROR check if more debug logs are needed from rbus. */
-void rbus_log_handler(
-    rbusLogLevel level,
-    const char* file,
-    int line,
-    int threadId,
-    char* message)
-{
-    ParodusPrint("threadId %d\n", threadId);
-    const char* slevel = "";
-
-    if(level < RBUS_LOG_ERROR)
-        return;
-
-    switch(level)
-    {
-	    case RBUS_LOG_DEBUG:    slevel = "DEBUG";   break;
-	    case RBUS_LOG_INFO:     slevel = "INFO";    break;
-	    case RBUS_LOG_WARN:     slevel = "WARN";    break;
-	    case RBUS_LOG_ERROR:    slevel = "ERROR";   break;
-	    case RBUS_LOG_FATAL:    slevel = "FATAL";   break;
-    }
-    ParodusInfo("%5s %s:%d -- %s\n", slevel, file, line, message);
-}
-
-void registerRbusLogger()
-{
-	rbus_registerLogHandler(rbus_log_handler);
-	ParodusPrint("Registered rbus log handler\n");
-}
-
-#ifdef WAN_FAILOVER_SUPPORTED
-void eventReceiveHandler( rbusHandle_t rbus_Handle, rbusEvent_t const* event, rbusEventSubscription_t* subscription );
-#endif
-
-/* API to register RBUS listener to receive messages from webconfig */
-void subscribeRBUSevent()
-{
-    int rc = RBUS_ERROR_SUCCESS;
-	err = rbus_open(&rbus_Handle, "parodus");
-	if (err)
-	{
-		ParodusError("rbus_open failed :%s\n", rbusError_ToString(err));
-		return;
-	}
-    rc = rbusEvent_SubscribeAsync(rbus_Handle,WEBCFG_UPSTREAM_EVENT,processWebconfigUpstreamEvent,subscribeAsyncHandler,"parodus",10*60);
-    if(rc != RBUS_ERROR_SUCCESS)
-        ParodusError("rbusEvent_Subscribe failed: %d, %s\n", rc, rbusError_ToString(rc));
-    else
-        ParodusInfo("rbusEvent_Subscribe was successful\n");
-}
-
-#ifdef WAN_FAILOVER_SUPPORTED
-/* API to subscribe Active Interface name on value change event*/
-int subscribeCurrentActiveInterfaceEvent()
-{
-	int rc = RBUS_ERROR_SUCCESS;
-	ParodusInfo("Subscribing to Device.X_RDK_WanManager.CurrentActiveInterface Event\n");
-	rc = rbusEvent_SubscribeAsync(rbus_Handle,WEBPA_INTERFACE,eventReceiveHandler,subscribeAsyncHandler,"parodusInterface",10*20);
-        if(rc != RBUS_ERROR_SUCCESS)
-	{
-		ParodusError("%s subscribe failed : %d - %s\n", WEBPA_INTERFACE, rc, rbusError_ToString(rc));
-        }   
-	return rc;	
-} 
-#endif
-
-void processWebconfigUpstreamEvent(rbusHandle_t handle, rbusEvent_t const* event, rbusEventSubscription_t* subscription)
-{
-    (void)handle;
-    (void)subscription;
-    
-    int rv=-1;
-	wrp_msg_t *event_msg;
-	void *bytes;
-	const uint8_t* bytesVal = NULL;
-    int len;
-    rbusValue_t value = NULL;
-
-    value = rbusObject_GetValue(event->data, "value");
-    bytesVal = rbusValue_GetBytes(value, &len);
-
-	bytes = (void*) bytesVal;
-	rv = wrp_to_struct( bytes, len, WRP_BYTES, &event_msg );
-	if(rv > 0)
-	{
-		ParodusInfo(" Received upstream event data: dest '%s'\n", event_msg->u.event.dest);
-		partners_t *partnersList = NULL;
-		int j = 0;
-
-		int ret = validate_partner_id(event_msg, &partnersList);
-		if(ret == 1)
-		{
-		    wrp_msg_t *eventMsg = (wrp_msg_t *) malloc(sizeof(wrp_msg_t));
-		    memset( eventMsg, 0, sizeof( wrp_msg_t ) );
-		    eventMsg->msg_type = event_msg->msg_type;
-		    eventMsg->u.event.content_type=event_msg->u.event.content_type;
-		    eventMsg->u.event.source=event_msg->u.event.source;
-		    eventMsg->u.event.dest=event_msg->u.event.dest;
-		    eventMsg->u.event.payload=event_msg->u.event.payload;
-		    eventMsg->u.event.payload_size=event_msg->u.event.payload_size;
-		    eventMsg->u.event.headers=event_msg->u.event.headers;
-		    eventMsg->u.event.metadata=event_msg->u.event.metadata;
-		    eventMsg->u.event.partner_ids = partnersList;
-		    if(event_msg->u.event.transaction_uuid)
-		    {
-			  ParodusPrint("Inside Trans id in PARODUS_rbus\n");
-		    }
-		    else
-		    {
-			  ParodusPrint("Assigning NULL to trans id RBUS\n");
-			  eventMsg->u.event.transaction_uuid = NULL;
-		    }
-
-		   int size = wrp_struct_to( eventMsg, WRP_BYTES, &bytes );
-		   if(size > 0)
-		   {
-		       sendUpstreamMsgToServer(&bytes, size);
-		   }
-		   free(eventMsg);
-		   free(bytes);
-		   bytes = NULL;
-		}
-		else
-		{
-		   sendUpstreamMsgToServer((void **)(&bytes), len);
-		}
-		if(partnersList != NULL)
-		{
-		    for(j=0; j<(int)partnersList->count; j++)
-		    {
-		        if(NULL != partnersList->partner_ids[j])
-		        {
-		             free(partnersList->partner_ids[j]);
-		        }
-		    }
-		    free(partnersList);
-		}
-		partnersList = NULL;
-	}
-}
-
-void subscribeAsyncHandler( rbusHandle_t handle, rbusEventSubscription_t* subscription, rbusError_t error)
-{
-	(void)handle;
-	ParodusInfo("subscribeAsyncHandler event %s, error %d - %s\n",subscription->eventName, error, rbusError_ToString(error));
-}
-
-#ifdef WAN_FAILOVER_SUPPORTED
-void eventReceiveHandler( rbusHandle_t rbus_Handle, rbusEvent_t const* event, rbusEventSubscription_t* subscription )
-{
-    (void)subscription;
-    ParodusPrint("Handling event inside eventReceiveHandler\n");
-    (void)rbus_Handle;
-    char * interface = NULL;
-    rbusValue_t newValue = rbusObject_GetValue(event->data, "value");
-    rbusValue_t oldValue = rbusObject_GetValue(event->data, "oldValue");
-    ParodusInfo("Consumer received ValueChange event for param %s\n", event->name);
-    
-    if(newValue) {    
-        interface = (char *) rbusValue_GetString(newValue, NULL);
-	setWebpaInterface(interface);
-    }
-    else {
-	   ParodusError("newValue is NULL\n");
-    }
-
-    if(newValue !=NULL && oldValue!=NULL && interface!=NULL) {
-	ParodusInfo("New Value: %s Old Value: %s New Interface Value: %s\n", rbusValue_GetString(newValue, NULL), rbusValue_GetString(oldValue, NULL), interface);
-	
-	// If interface is already down then reset it and reconnect cloud conn as wan failover event is received
-	if(get_interface_down_event()) 
-	{
-		reset_interface_down_event();
-		ParodusInfo("Interface_down_event is reset\n");
-		resume_heartBeatTimer();
-	}
-	// Close cloud conn and reconnect with the new interface as wan failover event is received
-	set_global_reconnect_reason("WAN_FAILOVER");
-	set_global_reconnect_status(true);
-	set_close_retry();
-
-    }
-    else {
-         if(oldValue == NULL) {
-     	        ParodusError("oldValue is NULL\n");
-         }  
-         if(interface == NULL) {
-	        ParodusError("interface is NULL\n"); 
-         }  
-    }
-}
-#endif
--- a/src/xmidtsend_rbus.c
+++ b/src/xmidtsend_rbus.c
--- a/src/xmidtsend_rbus.h
+++ b/src/xmidtsend_rbus.h
@@ -1,127 +0,0 @@
-/**
- * Copyright 2022 Comcast Cable Communications Management, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
- *
- */
-/**
- * @file xmidtsend_rbus.h
- *
- * @description This header defines functions required to manage xmidt send messages via rbus.
- *
- */
- 
-#ifndef _XMIDTSEND_RBUS_H_
-#define _XMIDTSEND_RBUS_H_
-#include <rbus.h>
-#include "config.h"
-#include <uuid/uuid.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define XMIDT_SEND_METHOD "Device.X_RDK_Xmidt.SendData"
-#define INPARAMS_PATH   "/tmp/inparams.txt"
-
-#define CLOUD_ACK_TIMEOUT_SEC       7
-#define CRITICAL_QOS_EXPIRE_TIME    30*60
-#define HIGH_QOS_EXPIRE_TIME        25*60
-#define MEDIUM_QOS_EXPIRE_TIME      20*60
-#define LOW_QOS_EXPIRE_TIME         15*60
-
-#define EXPIRY_CHECK_TIME           5*60 //To check expiry in every 5 mins when cloud connection is down.
-/*----------------------------------------------------------------------------*/
-/*                               Data Structures                              */
-/*----------------------------------------------------------------------------*/
-typedef struct XmidtMsg__
-{
-	wrp_msg_t *msg;
-	rbusMethodAsyncHandle_t asyncHandle;
-	int state;
-	long long enqueueTime;
-	long long sentTime;
-	struct XmidtMsg__ *next;
-} XmidtMsg;
-
-typedef struct CloudAck__
-{
-	char *transaction_id;
-	int qos;
-	int rdr;
-	char *source;
-	struct CloudAck__ *next;
-} CloudAck;
-
-typedef enum
-{
-    DELIVERED_SUCCESS = 0,
-    INVALID_MSG_TYPE,
-    MISSING_SOURCE,
-    MISSING_DEST,
-    MISSING_CONTENT_TYPE,
-    MISSING_PAYLOAD,
-    MISSING_PAYLOADLEN,
-    INVALID_CONTENT_TYPE,
-    ENQUEUE_FAILURE = 100,
-    CLIENT_DISCONNECT = 101,
-    QUEUE_SIZE_EXCEEDED = 102,
-    WRP_ENCODE_FAILURE = 103,
-    MSG_PROCESSING_FAILED = 104,
-    QOS_SEMANTICS_DISABLED = 105,
-    MSG_EXPIRED = 106,
-    QUEUE_OPTIMIZED = 107
-} XMIDT_STATUS;
-
-typedef enum
-{
-    PENDING = 0,
-    SENT,
-    DELETE
-} MSG_STATUS;
-/*----------------------------------------------------------------------------*/
-/*                             Function Prototypes                            */
-/*----------------------------------------------------------------------------*/
-
-rbusHandle_t get_parodus_rbus_Handle(void);
-void addToXmidtUpstreamQ(wrp_msg_t * msg, rbusMethodAsyncHandle_t asyncHandle);
-void* processXmidtUpstreamMsg();
-void processXmidtData();
-int processData(XmidtMsg *Datanode, wrp_msg_t * msg, rbusMethodAsyncHandle_t asyncHandle);
-int sendXmidtEventToServer(XmidtMsg *msgnode, wrp_msg_t * msg, rbusMethodAsyncHandle_t asyncHandle);
-int checkInputParameters(rbusObject_t inParams);
-char* generate_transaction_uuid();
-void parseRbusInparamsToWrp(rbusObject_t inParams, char *trans_id, wrp_msg_t **eventMsg);
-void createOutParamsandSendAck(wrp_msg_t *msg, rbusMethodAsyncHandle_t asyncHandle, char *errorMsg, int statuscode, char *cloudsource, rbusError_t error);
-int validateXmidtData(wrp_msg_t * eventMsg, char **errorMsg, int *statusCode);
-void printSendMsgData(char* status, int qos, char* dest, char* transaction_uuid);
-bool highQosValueCheck(int qos);
-void waitTillConnectionIsUp();
-void printRBUSParams(rbusObject_t params, char* file_path);
-void addToCloudAckQ(char *transaction_id, int qos, int rdr, char *source);
-int checkCloudACK(XmidtMsg *xmdnode, rbusMethodAsyncHandle_t asyncHandle);
-int updateXmidtState(XmidtMsg * temp, int state);
-void print_xmidMsg_list();
-int deleteCloudACKNode(char* trans_id);
-int deleteFromXmidtQ(XmidtMsg **next_node);
-int checkCloudConn();
-void checkMaxQandOptimize(XmidtMsg *xmdMsg);
-void checkMsgExpiry(XmidtMsg *xmdMsg);
-void mapXmidtStatusToStatusMessage(int status, char **message);
-int xmidtQOptmize();
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* _XMIDTSEND_RBUS_H_ */
-
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -16,9 +16,7 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -g -fprofile-arcs -ftest-coverage
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST ")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -W  -g -fprofile-arcs -ftest-coverage -O0")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage -O0")
-set (PARODUS_COMMON_SRC ../src/string_helpers.c ../src/mutex.c 
-  ../src/time.c ../src/config.c ../src/spin_thread.c 
-  ../src/event_handler.c ../src/token.c)
+set (PARODUS_COMMON_SRC ../src/string_helpers.c ../src/mutex.c ../src/time.c ../src/config.c ../src/spin_thread.c ../src/token.c)
 set (PARODUS_COMMON_LIBS gcov -lcunit -lcimplog -lwrp-c
 -luuid -lmsgpackc -lnopoll -lnanomsg -lpthread
 -Wl,--no-as-needed -lcjson -lcjwt -ltrower-base64
@@ -32,10 +30,6 @@ if (FEATURE_DNS_QUERY)
 set (PARODUS_COMMON_LIBS ${PARODUS_COMMON_LIBS} -lucresolv -lresolv)
 endif (FEATURE_DNS_QUERY)

-if (ENABLE_WEBCFGBIN)
-set (PARODUS_COMMON_LIBS ${PARODUS_COMMON_LIBS} -lrbus)
-endif (ENABLE_WEBCFGBIN)
-
 if(NOT DISABLE_VALGRIND)
 set (MEMORY_CHECK valgrind --leak-check=full --show-reachable=yes -v)
 endif ()
@@ -46,7 +40,7 @@ link_directories ( ${LIBRARY_DIR} )
 #   test_heartBeatTimer
 #-------------------------------------------------------------------------------
 add_test(NAME test_heartBeatTimer COMMAND ${MEMORY_CHECK} ./test_heartBeatTimer)
-add_executable(test_heartBeatTimer test_heartBeatTimer.c ../src/heartBeat.c ../src/time.c)
+add_executable(test_heartBeatTimer test_heartBeatTimer.c ../src/heartBeat.c)
 target_link_libraries (test_heartBeatTimer ${PARODUS_COMMON_LIBS} -lcmocka)

 #-------------------------------------------------------------------------------
@@ -61,10 +55,7 @@ target_link_libraries (test_close_retry ${PARODUS_COMMON_LIBS} -lcmocka)
 #-------------------------------------------------------------------------------
 add_test(NAME test_mutex COMMAND ${MEMORY_CHECK} ./test_mutex)
 add_executable(test_mutex test_mutex.c ../src/mutex.c)
-target_link_libraries (test_mutex gcov -lcunit -lcimplog -lwrp-c
- -luuid -lmsgpackc -lnopoll -lnanomsg -lpthread
- -Wl,--no-as-needed -lcjson -lcjwt -ltrower-base64
- -lssl -lcrypto -lrt -lm -lcmocka)
+target_link_libraries (test_mutex ${PARODUS_COMMON_LIBS} -lcmocka)

 #-------------------------------------------------------------------------------
 #   test_networking
@@ -77,8 +68,8 @@ target_link_libraries (test_networking ${PARODUS_COMMON_LIBS})
 #   test_nopoll_helpers
 #-------------------------------------------------------------------------------
 add_test(NAME test_nopoll_helpers COMMAND ${MEMORY_CHECK} ./test_nopoll_helpers)
-add_executable(test_nopoll_helpers test_nopoll_helpers.c ../src/nopoll_helpers.c ../src/string_helpers.c ../src/config.c)
-target_link_libraries (test_nopoll_helpers -Wl,--no-as-needed -lrt -lcmocka -lcimplog -lnopoll ${PARODUS_COMMON_LIBS})
+add_executable(test_nopoll_helpers test_nopoll_helpers.c ../src/nopoll_helpers.c)
+target_link_libraries (test_nopoll_helpers -Wl,--no-as-needed -lrt -lcmocka -lcimplog -lnopoll)

 #-------------------------------------------------------------------------------
 #   test_time
@@ -97,22 +88,22 @@ target_link_libraries (test_spin_thread_e ${PARODUS_COMMON_LIBS} )
 #-------------------------------------------------------------------------------
 #   test_spin_thread success
 #-------------------------------------------------------------------------------
-# add_test(NAME test_spin_thread_s COMMAND ${MEMORY_CHECK} ./test_spin_thread_s)
-# add_executable(test_spin_thread_s test_spin_thread_s.c ../src/spin_thread.c)
-# target_link_libraries (test_spin_thread_s ${PARODUS_COMMON_LIBS} )
+add_test(NAME test_spin_thread_s COMMAND ${MEMORY_CHECK} ./test_spin_thread_s)
+add_executable(test_spin_thread_s test_spin_thread_s.c ../src/spin_thread.c)
+target_link_libraries (test_spin_thread_s ${PARODUS_COMMON_LIBS} )

 #-------------------------------------------------------------------------------
 #   test_string_helpers 
 #-------------------------------------------------------------------------------
-# add_test(NAME test_string_helpers COMMAND ${MEMORY_CHECK} ./test_string_helpers)
-# add_executable(test_string_helpers test_string_helpers.c ../src/string_helpers.c)
-# target_link_libraries (test_string_helpers ${PARODUS_COMMON_LIBS} )
+add_test(NAME test_string_helpers COMMAND ${MEMORY_CHECK} ./test_string_helpers)
+add_executable(test_string_helpers test_string_helpers.c ../src/string_helpers.c)
+target_link_libraries (test_string_helpers ${PARODUS_COMMON_LIBS} )

 #-------------------------------------------------------------------------------
 #   test_nopoll_handlers
 #-------------------------------------------------------------------------------
 add_test(NAME test_nopoll_handlers COMMAND ${MEMORY_CHECK} ./test_nopoll_handlers)
-add_executable(test_nopoll_handlers test_nopoll_handlers.c ../src/nopoll_handlers.c ../src/heartBeat.c ../src/close_retry.c ../src/time.c)
+add_executable(test_nopoll_handlers test_nopoll_handlers.c ../src/nopoll_handlers.c ../src/heartBeat.c ../src/close_retry.c)
 target_link_libraries (test_nopoll_handlers -lnopoll -lcunit -lcimplog -Wl,--no-as-needed -lrt -lpthread -lm)


@@ -120,7 +111,7 @@ target_link_libraries (test_nopoll_handlers -lnopoll -lcunit -lcimplog -Wl,--no-
 #   test_nopoll_handlers_fragment
 #-------------------------------------------------------------------------------
 add_test(NAME test_nopoll_handlers_fragment COMMAND ${MEMORY_CHECK} ./test_nopoll_handlers_fragment)
-add_executable(test_nopoll_handlers_fragment test_nopoll_handlers_fragment.c ../src/nopoll_handlers.c ../src/heartBeat.c ../src/close_retry.c ../src/time.c)
+add_executable(test_nopoll_handlers_fragment test_nopoll_handlers_fragment.c ../src/nopoll_handlers.c ../src/heartBeat.c ../src/close_retry.c)
 target_link_libraries (test_nopoll_handlers_fragment -lnopoll -lcunit -lcimplog -Wl,--no-as-needed -lrt -lpthread -lm -lcmocka)

 #-------------------------------------------------------------------------------
@@ -161,11 +152,7 @@ set(CLIST_SRC ${CLIST_SRC} ../src/seshat_interface.c)
 else()
 set(CLIST_SRC ${CLIST_SRC} ../src/seshat_interface_stub.c)
 endif (ENABLE_SESHAT)
-
-if (ENABLE_WEBCFGBIN)
-set(CLIST_SRC ${CLIST_SRC} ../src/upstream_rbus.c ../src/xmidtsend_rbus.c)
-endif (ENABLE_WEBCFGBIN)
-
+ 
 add_executable(test_client_list ${CLIST_SRC})
 #target_link_libraries (test_client_list ${PARODUS_CONN_LIBS} ${PARODUS_COMMON_LIBS})
 target_link_libraries (test_client_list ${PARODUS_COMMON_LIBS} -lcurl -luuid)
@@ -183,10 +170,6 @@ else()
 set(SVA_SRC ${SVA_SRC} ../src/seshat_interface_stub.c)
 endif (ENABLE_SESHAT)

-if (ENABLE_WEBCFGBIN)
-set(SVA_SRC ${SVA_SRC} ../src/upstream_rbus.c ../src/xmidtsend_rbus.c)
-endif (ENABLE_WEBCFGBIN)
-
 add_executable(test_service_alive ${SVA_SRC})
 #target_link_libraries (test_service_alive ${PARODUS_CONN_LIBS} ${PARODUS_COMMON_LIBS})
 target_link_libraries (test_service_alive ${PARODUS_COMMON_LIBS} -lcurl -luuid)
@@ -215,7 +198,7 @@ target_link_libraries (test_auth_token -lcmocka
 #   test_auth_token_more
 #-------------------------------------------------------------------------------
 add_test(NAME test_auth_token_more COMMAND ${MEMORY_CHECK} ./test_auth_token_more)
-add_executable(test_auth_token_more test_auth_token_more.c ../src/config.c ../src/auth_token.c ../src/string_helpers.c ../src/config.c)
+add_executable(test_auth_token_more test_auth_token_more.c ../src/config.c ../src/auth_token.c ../src/string_helpers.c)
 target_link_libraries (test_auth_token_more -lcmocka
 -Wl,--no-as-needed -lcimplog
 -lcjson -lcjwt -ltrower-base64 -lssl -lcrypto -lrt -lm -lcurl -luuid
@@ -239,8 +222,7 @@ target_link_libraries (test_crud_tasks -lcmocka ${PARODUS_COMMON_LIBS} )
 #   test_crud_internal
 #-------------------------------------------------------------------------------
 add_test(NAME test_crud_internal COMMAND ${MEMORY_CHECK} ./test_crud_internal)
-add_executable(test_crud_internal test_crud_internal.c ../src/config.c ../src/close_retry.c 
-  ../src/ParodusInternal.c ../src/string_helpers.c ../src/crud_internal.c ../src/client_list.c)
+add_executable(test_crud_internal test_crud_internal.c ../src/config.c ../src/close_retry.c ../src/string_helpers.c ../src/crud_internal.c )
 target_link_libraries (test_crud_internal -lcmocka ${PARODUS_COMMON_LIBS} -lcurl -luuid)

 #-------------------------------------------------------------------------------
@@ -251,7 +233,7 @@ add_executable(test_upstream test_upstream.c ../src/upstream.c ../src/close_retr
 target_link_libraries (test_upstream -lcmocka gcov -lcunit -lcimplog
 -lwrp-c -luuid -lpthread -lmsgpackc -lnopoll
 -Wl,--no-as-needed -lcjson -lcjwt -ltrower-base64
- -lssl -lcrypto -lrt -lm -lnanomsg)
+ -lssl -lcrypto -lrt -lm)

 #-------------------------------------------------------------------------------
 #   test_upstream_sock
@@ -268,7 +250,7 @@ target_link_libraries (test_upstream_sock -lcmocka gcov -lcunit -lcimplog
 #   test_downstream
 #-------------------------------------------------------------------------------
 add_test(NAME test_downstream COMMAND ${MEMORY_CHECK} ./test_downstream)
-add_executable(test_downstream test_downstream.c ../src/downstream.c ../src/string_helpers.c ../src/config.c)
+add_executable(test_downstream test_downstream.c ../src/downstream.c ../src/string_helpers.c)
 target_link_libraries (test_downstream -lcmocka gcov -lcunit -lcimplog
 -lwrp-c -luuid -lpthread -lmsgpackc -lnopoll
 -Wl,--no-as-needed -lcjson -lcjwt -ltrower-base64
@@ -278,7 +260,7 @@ target_link_libraries (test_downstream -lcmocka gcov -lcunit -lcimplog
 #   test_downstream_more
 #-------------------------------------------------------------------------------
 add_test(NAME test_downstream_more COMMAND ${MEMORY_CHECK} ./test_downstream_more)
-add_executable(test_downstream_more test_downstream_more.c ../src/downstream.c ../src/string_helpers.c ../src/config.c)
+add_executable(test_downstream_more test_downstream_more.c ../src/downstream.c ../src/string_helpers.c)
 target_link_libraries (test_downstream_more -lcmocka ${PARODUS_COMMON_LIBS} )

 #-------------------------------------------------------------------------------
@@ -299,20 +281,14 @@ set(CONIFC_SRC test_conn_interface.c
  ../src/token.c
  ../src/string_helpers.c 
  ../src/mutex.c
-  ../src/time.c
  ../src/heartBeat.c
  ../src/close_retry.c
-  ../src/event_handler.c
-  ../src/client_list.c
 )
 if (ENABLE_SESHAT)
 set(CONIFC_SRC ${CONIFC_SRC} ../src/seshat_interface.c)
 else()
 set(CONIFC_SRC ${CONIFC_SRC} ../src/seshat_interface_stub.c)
 endif (ENABLE_SESHAT)
-if (ENABLE_WEBCFGBIN)
-set(CONIFC_SRC ${CONIFC_SRC} ../src/upstream_rbus.c ../src/xmidtsend_rbus.c)
-endif (ENABLE_WEBCFGBIN)
 add_executable(test_conn_interface ${CONIFC_SRC})
 target_link_libraries (test_conn_interface -lcmocka ${PARODUS_COMMON_LIBS} -lcurl -luuid )

@@ -344,7 +320,7 @@ set(TOKEN_SRC ../src/conn_interface.c ../src/config.c
 ../src/thread_tasks.c ../src/time.c
 ../src/string_helpers.c ../src/mutex.c 
 ../src/token.c ../src/heartBeat.c
- ../src/close_retry.c ../src/event_handler.c
+ ../src/close_retry.c
 )

 if (ENABLE_SESHAT)
@@ -359,10 +335,6 @@ else()
 set(TOKEN_SRC test_token_stub.c ${TOKEN_SRC})
 endif (FEATURE_DNS_QUERY)

-if (ENABLE_WEBCFGBIN)
-set(TOKEN_SRC ${TOKEN_SRC} ../src/upstream_rbus.c ../src/xmidtsend_rbus.c)
-endif (ENABLE_WEBCFGBIN)
-
 add_executable(test_token ${TOKEN_SRC} ) 
 #target_link_libraries (test_token ${PARODUS_COMMON_LIBS} ${PARODUS_JWT_LIBS} -lcmocka )
 target_link_libraries (test_token ${PARODUS_COMMON_LIBS} -lcmocka -lcurl -luuid)
--- a/tests/mock_event_handler.c
+++ b/tests/mock_event_handler.c
@@ -1,104 +0,0 @@
-/*
- * If not stated otherwise in this file or this component's Licenses.txt file the
- * following copyright and licenses apply:
- *
- * Copyright 2016 RDK Management
- * Copyright [2014] [Cisco Systems, Inc.]
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
-*/
-
-/* This is a test version of event_handler.c that can be used
- * to simulate interface down, interface up event
- * You overwrite event_handler.c in the src diectory with this
- * version.  It will generate interface down / interface up events
- * at random intervals between 60 secs and 124 secs
- */
-
-#include "parodus_log.h"
-#include "event_handler.h"
-#include "connection.h"
-#include "config.h"
-#include "heartBeat.h"
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
-#include <unistd.h>
-#include "time.h"
-#include "close_retry.h"
-
-extern bool g_shutdown;
-
-static pthread_t sysevent_tid;
-
-static void start_interface_down (void)
-{
-	  	set_interface_down_event();
-		ParodusInfo("Interface_down_event is set\n");				
-		pause_heartBeatTimer();
-}
-
-static void end_interface_down (void)
-{
-		reset_interface_down_event();
-		ParodusInfo("Interface_down_event is reset\n");
-		resume_heartBeatTimer();
-		set_close_retry();
-}
-
-// waits from 60 to 124 secs
-int wait_random (const char *msg)
-{
-  #define HALF_SEC 500000l
-  long delay = (random() >> 5) + 60000000l;
-  long secs, usecs;
-  struct timeval timeout;
-
-  secs = delay / 1000000;
-  usecs = delay % 1000000;
-  ParodusInfo ("Waiting %ld secs %ld usecs for %s\n", secs, usecs, msg);
-  
-  while (!g_shutdown) {
-	timeout.tv_sec = 0;
-	if (delay <= HALF_SEC) {
-	  timeout.tv_usec = delay;
-	  select (0, NULL, NULL, NULL, &timeout);
-	  return 0;
-	}
-	timeout.tv_usec = HALF_SEC;
-	delay -= HALF_SEC;
-	select (0, NULL, NULL, NULL, &timeout);
-  }
-  return -1;    
-}
-
-
-static void *parodus_sysevent_handler (void *data)
-{
-	while (!g_shutdown) {
-	  if (wait_random ("interface down") != 0)
-	    break;
-	  start_interface_down ();
-	  wait_random ("interface up");
-	  end_interface_down ();	
-	}
-	ParodusInfo ("Exiting event handler\n");
-	return data;
-}
-
-void EventHandler()
-{
-	ParodusInfo ("RAND_MAX is %ld (0x%lx)\n", RAND_MAX, RAND_MAX);
-	srandom (getpid());
-
-	pthread_create(&sysevent_tid, NULL, parodus_sysevent_handler, NULL);
-}
--- a/tests/simple_connection.c
+++ b/tests/simple_connection.c
@@ -92,7 +92,7 @@ void test_set_parodus_cfg()
    CU_ASSERT_STRING_EQUAL(cfg.hw_last_reboot_reason,get_parodus_cfg()->hw_last_reboot_reason);
    CU_ASSERT_STRING_EQUAL(cfg.fw_name,get_parodus_cfg()->fw_name);
    CU_ASSERT_STRING_EQUAL(cfg.webpa_url, get_parodus_cfg()->webpa_url);
-    CU_ASSERT_STRING_EQUAL(cfg.webpa_interface_used , getWebpaInterface());
+    CU_ASSERT_STRING_EQUAL(cfg.webpa_interface_used , get_parodus_cfg()->webpa_interface_used);
    CU_ASSERT_STRING_EQUAL(cfg.webpa_protocol, get_parodus_cfg()->webpa_protocol);
    CU_ASSERT_EQUAL(cfg.boot_time, get_parodus_cfg()->boot_time);
    CU_ASSERT_EQUAL(cfg.webpa_ping_timeout, get_parodus_cfg()->webpa_ping_timeout);
@@ -113,7 +113,7 @@ void test_getWebpaConveyHeader()
    CU_ASSERT_STRING_EQUAL(get_parodus_cfg()->hw_manufacturer, cJSON_GetObjectItem(payload, HW_MANUFACTURER)->valuestring);
    CU_ASSERT_STRING_EQUAL(get_parodus_cfg()->hw_last_reboot_reason, cJSON_GetObjectItem(payload, HW_LAST_REBOOT_REASON)->valuestring);
    CU_ASSERT_STRING_EQUAL(get_parodus_cfg()->fw_name, cJSON_GetObjectItem(payload, FIRMWARE_NAME)->valuestring);
-    CU_ASSERT_STRING_EQUAL(getWebpaInterface(), cJSON_GetObjectItem(payload, WEBPA_INTERFACE)->valuestring);
+    CU_ASSERT_STRING_EQUAL(get_parodus_cfg()->webpa_interface_used, cJSON_GetObjectItem(payload, WEBPA_INTERFACE)->valuestring);
    CU_ASSERT_STRING_EQUAL(get_parodus_cfg()->webpa_protocol, cJSON_GetObjectItem(payload, WEBPA_PROTOCOL)->valuestring);
    CU_ASSERT_EQUAL((int)get_parodus_cfg()->boot_time, cJSON_GetObjectItem(payload, BOOT_TIME)->valueint);

--- a/tests/test_auth_token.c
+++ b/tests/test_auth_token.c
@@ -55,31 +55,14 @@ int curl_easy_perform(CURL *curl)
 	return rtn;
 }

-extern int g_response_code;
-
-void setGlobalResponseCode (int response_code)
-{
-	g_response_code = response_code;
-}
-
 int curl_easy_getinfo(CURL *curl, CURLINFO CURLINFO_RESPONSE_CODE, long response_code)
 {
 	UNUSED(curl);
 	UNUSED(CURLINFO_RESPONSE_CODE);
-	if (0 != g_response_code)
-	{
-		response_code= g_response_code;
-		ParodusInfo("response_code is %ld\n", response_code);
-	}
+	UNUSED(response_code);
 	function_called();
 	return (int) mock();
 }
-
-char* get_global_reconnect_reason()
-{
-    return "none";
-}
-
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/
@@ -183,7 +166,6 @@ void test_requestNewAuthToken ()

  test_data.size = 0;
  test_data.data = token;
-  setGlobalResponseCode(200);
  will_return (curl_easy_perform, 0);
  expect_function_calls (curl_easy_perform, 1);
  will_return (curl_easy_getinfo, 0);
@@ -234,7 +216,6 @@ void test_getAuthToken ()
 	/* To test curl success case */
 	test_data.size = 0;
 	test_data.data = cfg.webpa_auth_token;
-	setGlobalResponseCode(200);
 	will_return (curl_easy_perform, 0);
 	expect_function_calls (curl_easy_perform, 1);

@@ -332,86 +313,6 @@ void test_write_callback_fn ()
 	free(data.data);
 }

-void test_requestNewAuthToken_non200 ()
-{
-  char token[1024];
-  ParodusCfg cfg;
-  int output;
-  memset(&cfg,0,sizeof(cfg));
-
-  cfg.token_server_url = strdup("https://dev.comcast.net/token");
-  parStrncpy(cfg.cert_path , "/etc/ssl/certs/ca-certificates.crt", sizeof(cfg.cert_path));
-  parStrncpy(cfg.webpa_interface_used , "eth0", sizeof(cfg.webpa_interface_used));
-  parStrncpy(cfg.hw_serial_number, "Fer23u948590", sizeof(cfg.hw_serial_number));
-  parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
-  set_parodus_cfg(&cfg);
-
-  test_data.size = 0;
-  test_data.data = token;
-  setGlobalResponseCode(404);
-  will_return (curl_easy_perform, 0);
-  expect_function_calls (curl_easy_perform, 1);
-  will_return (curl_easy_getinfo, 0);
-  expect_function_calls (curl_easy_getinfo, 1);
-
-  will_return (curl_easy_getinfo, 0);
-  expect_function_calls (curl_easy_getinfo, 1);
-
-  output = requestNewAuthToken (token, sizeof(token), 1);
-  assert_int_equal (output, -1);
-  assert_string_equal (token, "");
-  ParodusInfo("requestNewAuthToken output: %d token empty len: %lu\n", output, strlen(token));
-  free(cfg.token_server_url);
-}
-
-void test_getAuthTokenFailure_non200 ()
-{
-	ParodusCfg cfg;
-	memset(&cfg,0,sizeof(cfg));
-
-	cfg.token_server_url = strdup("https://dev.comcast.net/token");
-	cfg.client_cert_path = strdup("testcert");
-	parStrncpy(cfg.cert_path , "/etc/ssl/certs/ca-certificates.crt", sizeof(cfg.cert_path));
-	parStrncpy(cfg.webpa_interface_used , "eth0", sizeof(cfg.webpa_interface_used));
-	parStrncpy(cfg.hw_serial_number, "Fer23u948590", sizeof(cfg.hw_serial_number));
-	parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
-	set_parodus_cfg(&cfg);
-
-	will_return (curl_easy_perform, 0);
-	expect_function_calls (curl_easy_perform, 1);
-
-	will_return (curl_easy_getinfo, 0);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	will_return (curl_easy_getinfo, 0);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	will_return (curl_easy_perform, 0);
-	expect_function_calls (curl_easy_perform, 1);
-
-	will_return (curl_easy_getinfo, 0);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	will_return (curl_easy_getinfo, 0);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	will_return (curl_easy_perform, 0);
-	expect_function_calls (curl_easy_perform, 1);
-
-	will_return (curl_easy_getinfo, 0);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	will_return (curl_easy_getinfo, 0);
-	expect_function_calls (curl_easy_getinfo, 1);
-	setGlobalResponseCode(504);
-	getAuthToken(&cfg);
-
-	assert_string_equal( cfg.webpa_auth_token, "");
-
-	free(cfg.client_cert_path);
-	free(cfg.token_server_url);
-}
-
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
@@ -427,8 +328,6 @@ int main(void)
 	cmocka_unit_test(getAuthToken_MacNull),
 	cmocka_unit_test(test_getAuthToken),
 	cmocka_unit_test(test_getAuthTokenFailure),
-	cmocka_unit_test(test_requestNewAuthToken_non200),
-	cmocka_unit_test(test_getAuthTokenFailure_non200)
    };

    return cmocka_run_group_tests(tests, NULL, NULL);
--- a/tests/test_auth_token_more.c
+++ b/tests/test_auth_token_more.c
@@ -69,13 +69,6 @@ int curl_easy_getinfo(CURL *curl, CURLINFO CURLINFO_RESPONSE_CODE, long response
 	function_called();
 	return (int) mock();
 }
-
-char* get_global_reconnect_reason()
-{
-    return "none";
-}
-
-
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/
--- a/tests/test_client_list.c
+++ b/tests/test_client_list.c
@@ -32,8 +32,6 @@ pthread_t test_tid2;
 static void *client_rcv_task();
 static void *client2_rcv_task();

-int numLoops;
-
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/
--- a/tests/test_config.c
+++ b/tests/test_config.c
@@ -29,7 +29,6 @@
 #include "../src/ParodusInternal.h"

 extern int parse_mac_address (char *target, const char *arg);
-extern int parse_serial_num(char *target, const char *arg);
 extern int server_is_http (const char *full_url,
 	const char **server_ptr);
 extern int parse_webpa_url__(const char *full_url, 
@@ -54,11 +53,6 @@ void create_token_script(char *fname)
    system(command);
 }

-char* get_global_reconnect_reason()
-{
-    return "none";
-}
-
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/
@@ -104,7 +98,7 @@ void test_setParodusConfig()
    assert_string_equal(cfg.hw_last_reboot_reason, temp->hw_last_reboot_reason);
    assert_string_equal(cfg.webpa_path_url, temp->webpa_path_url);
    assert_string_equal(cfg.webpa_url, temp->webpa_url);
-    assert_string_equal(cfg.webpa_interface_used, getWebpaInterface());
+    assert_string_equal(cfg.webpa_interface_used, temp->webpa_interface_used);
    assert_string_equal(cfg.webpa_protocol, temp->webpa_protocol);
    assert_string_equal(cfg.webpa_uuid, temp->webpa_uuid);
    assert_string_equal(cfg.partner_id, temp->partner_id);
@@ -122,8 +116,6 @@ void test_setParodusConfig()
    assert_string_equal(cfg.jwt_key, temp->jwt_key);
 #endif
 	assert_string_equal(cfg.crud_config_file, temp->crud_config_file);
-
-    free(cfg.crud_config_file);
 }

 void test_getParodusConfig()
@@ -209,11 +201,13 @@ void test_parseCommandLine()

    ParodusCfg parodusCfg;
    memset(&parodusCfg,0,sizeof(parodusCfg));
+
 #ifdef FEATURE_DNS_QUERY
 	write_key_to_file ("../../tests/jwt_key.tst", jwt_key);
 #endif
    create_token_script("/tmp/token.sh");
    assert_int_equal (parseCommandLine(argc,command,&parodusCfg), 0);
+
    assert_string_equal( parodusCfg.hw_model, "TG1682");
    assert_string_equal( parodusCfg.hw_serial_number, "Fer23u948590");
    assert_string_equal( parodusCfg.hw_manufacturer, "ARRISGroup,Inc.");
@@ -305,9 +299,8 @@ void test_loadParodusCfg()
 {
    ParodusCfg  tmpcfg;
    ParodusCfg *Cfg = NULL;
-    char protocol[32] = {'\0'};
    Cfg = (ParodusCfg*)malloc(sizeof(ParodusCfg));
-    memset(Cfg, 0, sizeof(ParodusCfg));
+    char protocol[32] = {'\0'};

    parStrncpy(Cfg->hw_model, "TG1682", sizeof(Cfg->hw_model));
    parStrncpy(Cfg->hw_serial_number, "Fer23u948590", sizeof(Cfg->hw_serial_number));
@@ -358,14 +351,6 @@ void test_loadParodusCfg()
    assert_string_equal(tmpcfg.seshat_url, "ipc://tmp/seshat_service.url");
 #endif
 	assert_string_equal(tmpcfg.crud_config_file, "parodus_cfg.json");
-
-    free(tmpcfg.client_cert_path);
-    free(tmpcfg.token_server_url);
-    free(tmpcfg.crud_config_file);
-
-    free(Cfg->crud_config_file);
-    free(Cfg->client_cert_path);
-    free(Cfg->token_server_url);
    free(Cfg);
 }

@@ -437,8 +422,6 @@ void test_setDefaultValuesToCfg()
    assert_string_equal(cfg->webpa_path_url, WEBPA_PATH_URL);
    assert_string_equal(cfg->webpa_uuid, "1234567-345456546");
    assert_string_equal(cfg->cloud_status, CLOUD_STATUS_OFFLINE);
-
-    free(cfg);
 }

 void err_setDefaultValuesToCfg()
@@ -468,14 +451,6 @@ void test_parse_mac_address ()
 	assert_int_equal (parse_mac_address (result, ""), -1);
 }

-void test_parse_serial_num()
-{
-	char result[14];
-	assert_int_equal (parse_serial_num (result, "1234ABC00ab"), 0);
-	assert_int_equal (parse_serial_num (result, "$@@"), 0);
-	assert_int_equal (parse_serial_num (result, ""), 0);
-}	
-
 void test_server_is_http ()
 {
 	const char *server_ptr;
@@ -596,7 +571,6 @@ int main(void)
        cmocka_unit_test(err_loadParodusCfg),
        cmocka_unit_test(test_parse_num_arg),
        cmocka_unit_test(test_parse_mac_address),
-	cmocka_unit_test(test_parse_serial_num),
        cmocka_unit_test(test_get_algo_mask),
        cmocka_unit_test(test_server_is_http),
        cmocka_unit_test(test_parse_webpa_url__),
--- a/tests/test_conn_interface.c
+++ b/tests/test_conn_interface.c
@@ -33,7 +33,6 @@
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
-static char *reconnect_reason = "webpa_process_starts";
 UpStreamMsg *UpStreamMsgQ;
 ParodusMsg *ParodusMsgQ;
 pthread_mutex_t g_mutex=PTHREAD_MUTEX_INITIALIZER;
@@ -42,26 +41,14 @@ pthread_mutex_t nano_mut=PTHREAD_MUTEX_INITIALIZER;
 pthread_cond_t nano_con=PTHREAD_COND_INITIALIZER;
 pthread_mutex_t svc_mut=PTHREAD_MUTEX_INITIALIZER;
 pthread_cond_t svc_con=PTHREAD_COND_INITIALIZER;
-int numLoops;
-parodusOnPingStatusChangeHandler on_ping_status_change;

+ 
 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/
-void set_server_list_null (server_list_t *server_list)
+int createNopollConnection(noPollCtx *ctx)
 {
-	UNUSED(server_list);
-}
-
-int find_servers (server_list_t *server_list)
-{
-	UNUSED(server_list);
-	return FIND_SUCCESS;
-}
-
-int createNopollConnection(noPollCtx *ctx, server_list_t *server_list)
-{
-    UNUSED(ctx); UNUSED(server_list);
+    UNUSED(ctx);
    function_called();
    return (int) mock();
 }
@@ -71,10 +58,7 @@ void nopoll_log_set_handler	(noPollCtx *ctx, noPollLogHandler handler, noPollPtr
    UNUSED(ctx); UNUSED(handler); UNUSED(user_data);
    function_called(); 
 }
-int cloud_status_is_online (void)
-{
-	return 0;
-}
+
 void __report_log (noPollCtx * ctx, noPollDebugLevel level, const char * log_msg, noPollPtr user_data)
 {
    UNUSED(ctx); UNUSED(level); UNUSED(log_msg); UNUSED(user_data);
@@ -91,66 +75,19 @@ noPollMutexUnlock 	mutex_unlock
    function_called();
 }

-char *get_global_reconnect_reason()
+void start_conn_in_progress (void)
 {
-    return reconnect_reason;
-}
-
-char *get_global_shutdown_reason()
-{
-    return SHUTDOWN_REASON_PARODUS_STOP;
-}
-
-void set_global_shutdown_reason(char *reason)
-{
-    UNUSED(reason);
-}
-
-int getDeviceId(char **device_id, size_t *device_id_len)
-{
-	UNUSED(device_id); UNUSED(device_id_len);
-	return 0;
-}
-void start_conn_in_progress (unsigned long start_time)
-{
-	UNUSED(start_time);
 }   

 void stop_conn_in_progress (void)
 {
 }   

-void reset_interface_down_event (void)
-{
-}
-
-bool get_interface_down_event (void)
-{
-	return false;
-}
-
-void set_interface_down_event (void)
-{
-}
-
-int wait_while_interface_down (void)
-{
-	return 0;
-}
-
-void terminate_backoff_delay (void)
-{
-}
-
 void packMetaData()
 {
    function_called();
 }

-int get_parodus_init()
-{
-   return 0;
-}

 int get_cloud_disconnect_time(void)
 {
@@ -184,18 +121,6 @@ int serviceAliveTask()
    return 0;
 }

-int validate_partner_id(wrp_msg_t *msg, partners_t **partnerIds)
-{
-	UNUSED(msg); UNUSED(partnerIds);
-	return 0;
-}
-
-int sendUpstreamMsgToServer(void **resp_bytes, size_t resp_size)
-{
-	UNUSED(resp_bytes); UNUSED(resp_size);
-	return 0;
-}
-
 int nopoll_loop_wait(noPollCtx * ctx,long timeout)
 {
    UNUSED(ctx); UNUSED(timeout);
@@ -215,19 +140,12 @@ void set_global_reconnect_status(bool status)
    function_called();
 }

-void close_and_unref_connection(noPollConn *conn, bool is_shutting_down)
+void close_and_unref_connection(noPollConn *conn)
 {
-    UNUSED(conn); UNUSED(is_shutting_down);
+    UNUSED(conn);
    function_called();
 }

-int readFromFile(const char *file_name, char **data)
-{
-	UNUSED(file_name);
-	*data = strdup ("parodus_stopping");
-	return 1;
-}
-
 void nopoll_cleanup_library	()	
 {
    function_called();
@@ -316,6 +234,9 @@ void timespec_diff(struct timespec *start, struct timespec *stop,
   diff->tv_nsec = 1000;
 }

+void deleteAllClients (void)
+{
+}

 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
@@ -359,7 +280,6 @@ void test_createSocketConnection()

 void test_createSocketConnection1()
 {
-    numLoops =0;
    noPollCtx *ctx;
    ParodusCfg cfg;
    memset(&cfg,0, sizeof(ParodusCfg));
@@ -389,11 +309,12 @@ void test_createSocketConnection1()
    expect_function_call(nopoll_ctx_unref);
    expect_function_call(nopoll_cleanup_library);
    createSocketConnection(NULL);
+    assert_string_equal(get_parodus_cfg()->cloud_status, CLOUD_STATUS_OFFLINE);
+    
 }

 void test_PingMissIntervalTime()
 {
-    numLoops = 6;
    noPollCtx *ctx;
    ParodusCfg cfg;
    memset(&cfg,0,sizeof(ParodusCfg));
@@ -411,6 +332,7 @@ void test_PingMissIntervalTime()
    //Max ping timeout is 6 sec
    cfg.webpa_ping_timeout = 6;
    set_parodus_cfg(&cfg);
+    
    reset_close_retry();
    expect_function_call(nopoll_thread_handlers);
    
@@ -446,11 +368,11 @@ void test_PingMissIntervalTime()
    expect_function_call(nopoll_ctx_unref);
    expect_function_call(nopoll_cleanup_library);
    createSocketConnection(NULL);
+    
 }

 void err_createSocketConnection()
 {
-    numLoops =0;
    set_close_retry();
    reset_heartBeatTimer();
    expect_function_call(nopoll_thread_handlers);
@@ -483,7 +405,6 @@ void err_createSocketConnection()

 void test_createSocketConnection_cloud_disconn()
 {
-        numLoops =0;
 	ParodusCfg cfg;
 	memset(&cfg,0,sizeof(ParodusCfg));
 	cfg.cloud_disconnect = strdup("XPC");
--- a/tests/test_connection.c
+++ b/tests/test_connection.c
@@ -15,14 +15,15 @@
 */
 #include <stdarg.h>

+#include <CUnit/Basic.h>
 #include <stdbool.h>
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
 #include <cmocka.h>
 #include <assert.h>
+#include <CUnit/Basic.h>
 #include <nopoll.h>
-#include <pthread.h>

 #include "../src/ParodusInternal.h"
 #include "../src/connection.h"
@@ -37,11 +38,6 @@ extern void init_expire_timer (expire_timer_t *timer);
 extern int check_timer_expired (expire_timer_t *timer, long timeout_ms);
 extern void init_backoff_timer (backoff_timer_t *timer, int max_count);
 extern int update_backoff_delay (backoff_timer_t *timer);
-extern void add_timespec (struct timespec *t1, struct timespec *t2);
-extern unsigned calc_random_secs (int random_num, unsigned max_secs);
-extern unsigned calc_random_nsecs (int random_num);
-void calc_random_expiration (int random_num1, int random_num2, 
-  backoff_timer_t *timer, struct timespec *ts);
 extern int init_header_info (header_info_t *header_info);
 extern void free_header_info (header_info_t *header_info);
 extern char *build_extra_hdrs (header_info_t *header_info);
@@ -62,10 +58,9 @@ extern int keep_trying_to_connect (create_connection_ctx_t *ctx,
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/

+bool close_retry;
 bool LastReasonStatus;
-bool interface_down_event = false;
-pthread_mutex_t interface_down_mut=PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t interface_down_con=PTHREAD_COND_INITIALIZER;
+pthread_mutex_t close_mut;

 // Mock values
 bool g_shutdown = false;
@@ -85,42 +80,6 @@ char* getWebpaConveyHeader()
    return (char*) "WebPA-1.6 (TG1682)";
 }

-
-void set_interface_down_event()
-{
-        interface_down_event = true;
-}
-
-void reset_interface_down_event() 
-{
-	pthread_mutex_lock (&interface_down_mut);
-	interface_down_event = false;
-	pthread_cond_signal(&interface_down_con);
-	pthread_mutex_unlock (&interface_down_mut);
-}
-
-bool get_interface_down_event() 
-{
-	return interface_down_event;
-}
-
-pthread_cond_t *get_interface_down_con(void)
-{
-    return &interface_down_con;
-}
-
-pthread_mutex_t *get_interface_down_mut(void)
-{
-    return &interface_down_mut;
-}
-
-int readFromFile(const char *file_name, char **data)
-{
-	UNUSED(file_name);
-	*data = strdup ("parodus_stopping");
-	return 1;
-}
-
 noPollConn * nopoll_conn_new_opts (noPollCtx  * ctx, noPollConnOpts  * opts, const char  * host_ip, const char  * host_port, const char  * host_name,const char  * get_url,const char  * protocols, const char * origin)
 {
    UNUSED(host_port); UNUSED(host_name); UNUSED(get_url); UNUSED(protocols); 
@@ -189,9 +148,11 @@ void nopoll_conn_close (noPollConn *conn)
    UNUSED(conn);
 }

-void nopoll_conn_close_ext (noPollConn *conn, int status, const char *reason, int reason_size)
+int nopoll_conn_ref_count (noPollConn *conn)
 {
-    UNUSED(conn); UNUSED(status); UNUSED(reason); UNUSED(reason_size);
+    UNUSED(conn);
+    function_called ();
+    return (nopoll_bool) mock();
 }

 int checkHostIp(char * serverIP)
@@ -239,7 +200,6 @@ int allow_insecure_conn (char **server_addr, unsigned int *port)
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/

-
 void test_get_global_conn()
 {
    assert_null(get_global_conn());
@@ -266,7 +226,7 @@ void test_set_global_reconnect_reason()

 void test_closeConnection()
 {
-    close_and_unref_connection(get_global_conn(), false);
+    close_and_unref_connection(get_global_conn());
 }

 void test_server_is_null()
@@ -343,67 +303,13 @@ void test_expire_timer()

 void test_backoff_delay_timer()
 {
-  struct timespec t1;
-  struct timespec t2;
  backoff_timer_t btimer;
-
  init_backoff_timer (&btimer, 5);
  assert_int_equal (3, update_backoff_delay (&btimer));
  assert_int_equal (7, update_backoff_delay (&btimer));
  assert_int_equal (15, update_backoff_delay (&btimer));
  assert_int_equal (31, update_backoff_delay (&btimer));
-
-  t1.tv_sec = 3; t1.tv_nsec = 0;
-  t2.tv_sec = 3; t2.tv_nsec = 0;
-  add_timespec (&t1, &t2);
-  assert_int_equal (6, t2.tv_sec);
-  assert_int_equal (0, t2.tv_nsec);
-
-  t1.tv_sec = 3; t1.tv_nsec = 500*1000000;
-  t2.tv_sec = 3; t2.tv_nsec = 499*1000000;
-  add_timespec (&t1, &t2);
-  assert_int_equal (6, t2.tv_sec);
-  assert_int_equal (999*1000000, t2.tv_nsec);
-  
-  t1.tv_sec = 3; t1.tv_nsec = 500*1000000;
-  t2.tv_sec = 3; t2.tv_nsec = 501*1000000;
-  add_timespec (&t1, &t2);
-  assert_int_equal (7, t2.tv_sec);
-  assert_int_equal (1000000, t2.tv_nsec);
-  
-  assert_int_equal (3, calc_random_secs (0, 7));
-  assert_int_equal (4, calc_random_secs (1, 7));
-  assert_int_equal (7, calc_random_secs (15, 7));
-  assert_int_equal (3, calc_random_secs (16, 15));
-  assert_int_equal (14, calc_random_secs (30,15));
-  
-  assert_int_equal (250000, calc_random_nsecs (500000));
-  assert_int_equal (1, calc_random_nsecs (2000000002));
-
-  init_backoff_timer (&btimer, 5);
-  t1.tv_sec = 0; t1.tv_nsec = 0;
-  /* max delay is 3 */
-  calc_random_expiration (0, 0, &btimer, &t1);
-  assert_int_equal (3, t1.tv_sec); 
-  assert_int_equal (0, t1.tv_nsec);  
-  
-  t1.tv_sec = 0; t1.tv_nsec = 0;
-  /* max delay is 7*/
-  calc_random_expiration (15, 1073741824, &btimer, &t1);
-  assert_int_equal (7, t1.tv_sec);
-  assert_int_equal (536870912, t1.tv_nsec);  
-
-  t1.tv_sec = 0; t1.tv_nsec = 0;
-  /* max delay is 15 */
-  calc_random_expiration (30, 2000000002, &btimer, &t1);
-  assert_int_equal (14, t1.tv_sec);
-  assert_int_equal (1, t1.tv_nsec);  
-
-  t1.tv_sec = 0; t1.tv_nsec = 0;
-  /* max delay is 31 */
-  calc_random_expiration (32, 1, &btimer, &t1);
-  assert_int_equal (3, t1.tv_sec);
-  assert_int_equal (0, t1.tv_nsec);  
+  assert_int_equal (31, update_backoff_delay (&btimer));
 }


@@ -459,19 +365,16 @@ void test_extra_headers ()

 void test_set_current_server()
 {
-  server_list_t server_list;
  create_connection_ctx_t ctx;
-  memset (&server_list, 0xFF, sizeof(server_list));
-  memset (&ctx, 0, sizeof(ctx));
-  ctx.server_list = &server_list;
+  memset (&ctx, 0xFF, sizeof(ctx));
  set_current_server (&ctx);
-  assert_ptr_equal (&ctx.server_list->redirect, ctx.current_server);
-  set_server_null (&ctx.server_list->redirect);
+  assert_ptr_equal (&ctx.server_list.redirect, ctx.current_server);
+  set_server_null (&ctx.server_list.redirect);
  set_current_server (&ctx);
-  assert_ptr_equal (&ctx.server_list->jwt, ctx.current_server);
-  set_server_null (&ctx.server_list->jwt);
+  assert_ptr_equal (&ctx.server_list.jwt, ctx.current_server);
+  set_server_null (&ctx.server_list.jwt);
  set_current_server (&ctx);
-  assert_ptr_equal (&ctx.server_list->defaults, ctx.current_server);
+  assert_ptr_equal (&ctx.server_list.defaults, ctx.current_server);
 }

 void init_cfg_header_info (ParodusCfg *cfg)
@@ -687,12 +590,10 @@ void test_nopoll_connect ()

 void test_wait_connection_ready ()
 {
-  server_list_t server_list;
  create_connection_ctx_t ctx;

-  set_server_list_null (&server_list);
  memset(&ctx,0,sizeof(ctx));
-  ctx.server_list = &server_list;
+  set_server_list_null (&ctx.server_list);

  mock_wait_status = 0;
  mock_redirect = NULL;
@@ -721,22 +622,22 @@ void test_wait_connection_ready ()
  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
  assert_int_equal (wait_connection_ready (&ctx), WAIT_ACTION_RETRY);
-  assert_string_equal (ctx.server_list->redirect.server_addr, "mydns.mycom.net");
-  assert_int_equal (ctx.server_list->redirect.port, 8080);
-  assert_int_equal (0, ctx.server_list->redirect.allow_insecure);
-  assert_ptr_equal (ctx.current_server, &ctx.server_list->redirect);
-  free_server (&ctx.server_list->redirect);
+  assert_string_equal (ctx.server_list.redirect.server_addr, "mydns.mycom.net");
+  assert_int_equal (ctx.server_list.redirect.port, 8080);
+  assert_int_equal (0, ctx.server_list.redirect.allow_insecure);
+  assert_ptr_equal (ctx.current_server, &ctx.server_list.redirect);
+  free_server (&ctx.server_list.redirect);
  
  mock_wait_status = 303;
  mock_redirect = "http://mydns.mycom.net";
  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
  assert_int_equal (wait_connection_ready (&ctx), WAIT_ACTION_RETRY);
-  assert_string_equal (ctx.server_list->redirect.server_addr, "mydns.mycom.net");
-  assert_int_equal (ctx.server_list->redirect.port, 80);
-  assert_int_equal (1, ctx.server_list->redirect.allow_insecure);
-  assert_ptr_equal (ctx.current_server, &ctx.server_list->redirect);
-  free_server (&ctx.server_list->redirect);
+  assert_string_equal (ctx.server_list.redirect.server_addr, "mydns.mycom.net");
+  assert_int_equal (ctx.server_list.redirect.port, 80);
+  assert_int_equal (1, ctx.server_list.redirect.allow_insecure);
+  assert_ptr_equal (ctx.current_server, &ctx.server_list.redirect);
+  free_server (&ctx.server_list.redirect);
  
    mock_wait_status = 403;
    will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
@@ -754,7 +655,6 @@ void test_wait_connection_ready ()

 void test_connect_and_wait ()
 {
-  server_list_t server_list;
  create_connection_ctx_t ctx;
  noPollCtx test_nopoll_ctx;
  server_t test_server;
@@ -771,9 +671,7 @@ void test_connect_and_wait ()

  mock_wait_status = 0;
  
-  set_server_list_null (&server_list);
  memset(&ctx,0,sizeof(ctx));
-  ctx.server_list = &server_list;
  ctx.nopoll_ctx = &test_nopoll_ctx;
  ctx.current_server = &test_server;
  ctx.extra_headers = test_extra_headers;
@@ -797,6 +695,8 @@ void test_connect_and_wait ()
  expect_function_call (nopoll_conn_is_ok);
  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
  assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_RETRY_DNS);

  Cfg.flags = 0;
@@ -806,6 +706,8 @@ void test_connect_and_wait ()
  expect_function_call (nopoll_conn_new_opts);
  will_return (nopoll_conn_is_ok, nopoll_false);
  expect_function_call (nopoll_conn_is_ok);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
  assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_RETRY_DNS);

  will_return (nopoll_conn_new_opts, &connection1);
@@ -843,6 +745,8 @@ void test_connect_and_wait ()
  expect_function_call (nopoll_conn_tls_new6);
  will_return (nopoll_conn_is_ok, nopoll_false);
  expect_function_call (nopoll_conn_is_ok);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
  will_return (nopoll_conn_tls_new, NULL);
  expect_function_call (nopoll_conn_tls_new);
  will_return (checkHostIp, 0);
@@ -853,6 +757,8 @@ void test_connect_and_wait ()
  expect_function_call (nopoll_conn_tls_new6);
  will_return (nopoll_conn_is_ok, nopoll_false);
  expect_function_call (nopoll_conn_is_ok);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
  will_return (nopoll_conn_tls_new, &connection1);
  expect_function_call (nopoll_conn_tls_new);
  will_return (nopoll_conn_is_ok, nopoll_true);
@@ -872,6 +778,8 @@ void test_connect_and_wait ()
  mock_redirect = "mydns.mycom.net";
  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
  assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_RETRY_DNS);

  will_return (nopoll_conn_tls_new, &connection1);
@@ -882,15 +790,17 @@ void test_connect_and_wait ()
  mock_redirect = "https://mydns.mycom.net";
  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
  assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_ACTION_RETRY);
 }

 void test_keep_trying ()
 {
  int rtn;	
-  server_list_t server_list;
  create_connection_ctx_t ctx;
  noPollCtx test_nopoll_ctx;
+  server_t test_server;
  backoff_timer_t backoff_timer;
  ParodusCfg Cfg;

@@ -900,16 +810,14 @@ void test_keep_trying ()

  mock_wait_status = 0;

-  set_server_list_null (&server_list);
  memset(&ctx,0,sizeof(ctx));
-  ctx.server_list = &server_list;
  ctx.nopoll_ctx = &test_nopoll_ctx;
+  ctx.current_server = &test_server;
+
+  test_server.allow_insecure = 1;
+  test_server.server_addr = "mydns.mycom.net";
+  test_server.port = 8080;

-  server_list.defaults.allow_insecure = 1;
-  server_list.defaults.server_addr = "mydns.mycom.net";
-  server_list.defaults.port = 8080;
-  set_current_server (&ctx);
-  
  Cfg.flags = 0;
  set_parodus_cfg(&Cfg);

@@ -923,7 +831,7 @@ void test_keep_trying ()
  rtn = keep_trying_to_connect (&ctx, &backoff_timer);
  assert_int_equal (rtn, true);

-  server_list.defaults.allow_insecure = 0;
+  test_server.allow_insecure = 0;
  Cfg.flags = FLAGS_IPV4_ONLY;
  set_parodus_cfg(&Cfg);

@@ -935,6 +843,8 @@ void test_keep_trying ()
  mock_redirect = "https://mydns.mycom.net";
  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
  will_return (nopoll_conn_tls_new, &connection1);
  expect_function_call (nopoll_conn_tls_new);
  will_return (nopoll_conn_is_ok, nopoll_true);
@@ -953,12 +863,16 @@ void test_keep_trying ()
  mock_redirect = "https://mydns.mycom.net";
  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
  will_return (nopoll_conn_tls_new, &connection1);
  expect_function_call (nopoll_conn_tls_new);
  will_return (nopoll_conn_is_ok, nopoll_true);
  expect_function_call (nopoll_conn_is_ok);
  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
  init_backoff_timer (&backoff_timer, 5);
  rtn = keep_trying_to_connect (&ctx, &backoff_timer);
  assert_int_equal (rtn, false);
@@ -981,6 +895,8 @@ void test_keep_trying ()
  expect_function_call (nopoll_conn_is_ok);
  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
  init_backoff_timer (&backoff_timer, 5);
  rtn = keep_trying_to_connect (&ctx, &backoff_timer);
  assert_int_equal (rtn, false);
@@ -990,182 +906,8 @@ void test_create_nopoll_connection()
 {
  int rtn;
  ParodusCfg cfg;
-  server_list_t server_list;
  noPollCtx test_nopoll_ctx;

-  set_server_list_null (&server_list);
-  memset(&cfg,0,sizeof(cfg));
-
-  cfg.flags = 0;
-  parStrncpy (cfg.webpa_url, "mydns.mycom.net:8080", sizeof(cfg.webpa_url));
-  cfg.boot_time = 25;
-  parStrncpy (cfg.hw_last_reboot_reason, "Test reason", sizeof(cfg.hw_last_reboot_reason));
-  cfg.webpa_backoff_max = 30;
-  parStrncpy (cfg.webpa_auth_token, "Auth---", sizeof (cfg.webpa_auth_token));
-  parStrncpy(cfg.hw_model, "TG1682", sizeof(cfg.hw_model));
-  parStrncpy(cfg.hw_manufacturer , "ARRISGroup,Inc.", sizeof(cfg.hw_manufacturer));
-  parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
-  parStrncpy(cfg.fw_name , "2.364s2", sizeof(cfg.fw_name));
-  parStrncpy(cfg.webpa_protocol , "WebPA-1.6", sizeof(cfg.webpa_protocol));
-  set_parodus_cfg(&cfg);
-  rtn = createNopollConnection (&test_nopoll_ctx, &server_list);
-  assert_int_equal (rtn, nopoll_false);
-
-  parStrncpy (cfg.webpa_url, "http://mydns.mycom.net:8080", sizeof(cfg.webpa_url));
-  set_parodus_cfg(&cfg);
-  set_server_list_null (&server_list);
-
-  mock_wait_status = 0;
-  
-  will_return (nopoll_conn_new_opts, &connection1);
-  expect_function_call (nopoll_conn_new_opts);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  rtn = createNopollConnection (&test_nopoll_ctx, &server_list);
-  assert_int_equal (rtn, nopoll_true);
-
-  parStrncpy (cfg.webpa_url, "https://mydns.mycom.net:8080", sizeof(cfg.webpa_url));
-  cfg.flags = 0;
-  set_parodus_cfg(&cfg);
-  set_server_list_null (&server_list);
-
-  will_return (nopoll_conn_tls_new6, &connection1);
-  expect_function_call (nopoll_conn_tls_new6);
-  will_return (nopoll_conn_is_ok, nopoll_false);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  rtn = createNopollConnection (&test_nopoll_ctx, &server_list);
-  assert_int_equal (rtn, nopoll_true);
-
-  set_server_list_null (&server_list);
-
-  will_return (nopoll_conn_tls_new6, &connection1);
-  expect_function_call (nopoll_conn_tls_new6);
-  will_return (nopoll_conn_is_ok, nopoll_false);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  mock_wait_status = 302;
-  mock_redirect = "https://mydns.mycom.net";
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-
-  will_return (nopoll_conn_tls_new6, &connection1);
-  expect_function_call (nopoll_conn_tls_new6);
-  will_return (nopoll_conn_is_ok, nopoll_false);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  mock_wait_status = 0;
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  rtn = createNopollConnection (&test_nopoll_ctx, &server_list);
-  assert_int_equal (rtn, nopoll_true);
-
-#ifdef FEATURE_DNS_QUERY
-  cfg.acquire_jwt = 1;
-  cfg.flags = FLAGS_IPV4_ONLY;
-  set_parodus_cfg(&cfg);
-  set_server_list_null (&server_list);
-  
-  will_return (allow_insecure_conn, -1);
-  expect_function_call (allow_insecure_conn);
-  will_return (nopoll_conn_tls_new, NULL);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (checkHostIp, 0);
-  expect_function_call (checkHostIp);
-  mock_server_addr = "mydns.myjwtcom.net";
-  mock_port = 80;
-  will_return (allow_insecure_conn, 0);
-  expect_function_call (allow_insecure_conn);
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  rtn = createNopollConnection (&test_nopoll_ctx, &server_list);
-  assert_int_equal (rtn, nopoll_true);
-    
-  set_server_list_null (&server_list);
-  mock_server_addr = "mydns.myjwtcom.net";
-  mock_port = 80;
-  will_return (allow_insecure_conn, 0);
-  expect_function_call (allow_insecure_conn);
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  rtn = createNopollConnection (&test_nopoll_ctx, &server_list);
-  assert_int_equal (rtn, nopoll_true);
-
-  cfg.flags = 0;
-  set_parodus_cfg(&cfg);
-  set_server_list_null (&server_list);
-
-  will_return (allow_insecure_conn, -1);
-  expect_function_call (allow_insecure_conn);
-  will_return (nopoll_conn_tls_new6, &connection1);
-  expect_function_call (nopoll_conn_tls_new6);
-  will_return (nopoll_conn_is_ok, nopoll_false);
-  expect_function_call (nopoll_conn_is_ok);
-  mock_wait_status = 0;
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  rtn = createNopollConnection (&test_nopoll_ctx, &server_list);
-  assert_int_equal (rtn, nopoll_true);
-#endif
-
-}
-
-void test_get_interface_down_event()
-{
-    assert_false(get_interface_down_event());
-    set_interface_down_event();
-}
-
-void *a()
-{   
-    sleep(15);
-    reset_interface_down_event();
-    pthread_exit(0);
-    return NULL;
-}
-
-
-void test_interface_down_retry()
-{ 
-  int rtn;
-  ParodusCfg cfg;
-  noPollCtx test_nopoll_ctx;
-  server_list_t server_list;
-  pthread_t thread_a;
-
-  pthread_create(&thread_a, NULL, a, NULL);
-
  memset(&cfg,0,sizeof(cfg));
  cfg.flags = 0;
  parStrncpy (cfg.webpa_url, "mydns.mycom.net:8080", sizeof(cfg.webpa_url));
@@ -1179,8 +921,7 @@ void test_interface_down_retry()
  parStrncpy(cfg.fw_name , "2.364s2", sizeof(cfg.fw_name));
  parStrncpy(cfg.webpa_protocol , "WebPA-1.6", sizeof(cfg.webpa_protocol));
  set_parodus_cfg(&cfg);
-  set_server_list_null (&server_list);
-  rtn = createNopollConnection (&test_nopoll_ctx, &server_list);
+  rtn = createNopollConnection (&test_nopoll_ctx);
  assert_int_equal (rtn, nopoll_false);

  parStrncpy (cfg.webpa_url, "http://mydns.mycom.net:8080", sizeof(cfg.webpa_url));
@@ -1194,8 +935,7 @@ void test_interface_down_retry()
  expect_function_call (nopoll_conn_is_ok);
  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  set_server_list_null (&server_list);
-  rtn = createNopollConnection (&test_nopoll_ctx, &server_list);
+  rtn = createNopollConnection (&test_nopoll_ctx);
  assert_int_equal (rtn, nopoll_true);

  parStrncpy (cfg.webpa_url, "https://mydns.mycom.net:8080", sizeof(cfg.webpa_url));
@@ -1206,20 +946,23 @@ void test_interface_down_retry()
  expect_function_call (nopoll_conn_tls_new6);
  will_return (nopoll_conn_is_ok, nopoll_false);
  expect_function_call (nopoll_conn_is_ok);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
  will_return (nopoll_conn_tls_new, &connection1);
  expect_function_call (nopoll_conn_tls_new);
  will_return (nopoll_conn_is_ok, nopoll_true);
  expect_function_call (nopoll_conn_is_ok);
  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  set_server_list_null (&server_list);
-  rtn = createNopollConnection (&test_nopoll_ctx, &server_list);
+  rtn = createNopollConnection (&test_nopoll_ctx);
  assert_int_equal (rtn, nopoll_true);

  will_return (nopoll_conn_tls_new6, &connection1);
  expect_function_call (nopoll_conn_tls_new6);
  will_return (nopoll_conn_is_ok, nopoll_false);
  expect_function_call (nopoll_conn_is_ok);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
  will_return (nopoll_conn_tls_new, &connection1);
  expect_function_call (nopoll_conn_tls_new);
  will_return (nopoll_conn_is_ok, nopoll_true);
@@ -1228,11 +971,15 @@ void test_interface_down_retry()
  mock_redirect = "https://mydns.mycom.net";
  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);

  will_return (nopoll_conn_tls_new6, &connection1);
  expect_function_call (nopoll_conn_tls_new6);
  will_return (nopoll_conn_is_ok, nopoll_false);
  expect_function_call (nopoll_conn_is_ok);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
  will_return (nopoll_conn_tls_new, &connection1);
  expect_function_call (nopoll_conn_tls_new);
  will_return (nopoll_conn_is_ok, nopoll_true);
@@ -1240,8 +987,7 @@ void test_interface_down_retry()
  mock_wait_status = 0;
  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  set_server_list_null (&server_list);
-  rtn = createNopollConnection (&test_nopoll_ctx, &server_list);
+  rtn = createNopollConnection (&test_nopoll_ctx);
  assert_int_equal (rtn, nopoll_true);

 #ifdef FEATURE_DNS_QUERY
@@ -1265,8 +1011,7 @@ void test_interface_down_retry()
  expect_function_call (nopoll_conn_is_ok);
  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  set_server_list_null (&server_list);
-  rtn = createNopollConnection (&test_nopoll_ctx, &server_list);
+  rtn = createNopollConnection (&test_nopoll_ctx);
  assert_int_equal (rtn, nopoll_true);
    
  cfg.flags = 0;
@@ -1278,6 +1023,8 @@ void test_interface_down_retry()
  expect_function_call (nopoll_conn_tls_new6);
  will_return (nopoll_conn_is_ok, nopoll_false);
  expect_function_call (nopoll_conn_is_ok);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
  mock_wait_status = 0;
  will_return (nopoll_conn_tls_new, &connection1);
  expect_function_call (nopoll_conn_tls_new);
@@ -1285,12 +1032,12 @@ void test_interface_down_retry()
  expect_function_call (nopoll_conn_is_ok);
  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  set_server_list_null (&server_list);
-  rtn = createNopollConnection (&test_nopoll_ctx, &server_list);
+  rtn = createNopollConnection (&test_nopoll_ctx);
  assert_int_equal (rtn, nopoll_true);
 #endif
-   pthread_join(thread_a, NULL);
-} 
+
+}
+

 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
@@ -1318,9 +1065,7 @@ int main(void)
        cmocka_unit_test(test_wait_connection_ready),
        cmocka_unit_test(test_connect_and_wait),
        cmocka_unit_test(test_keep_trying),
-	    cmocka_unit_test(test_create_nopoll_connection),
-        cmocka_unit_test(test_get_interface_down_event),
-        cmocka_unit_test(test_interface_down_retry)
+	cmocka_unit_test(test_create_nopoll_connection)
    };

    return cmocka_run_group_tests(tests, NULL, NULL);
--- a/tests/test_createConnection.c
+++ b/tests/test_createConnection.c
@@ -341,7 +341,7 @@ void test_createConnection()

    int ret = createNopollConnection(ctx);
    assert_int_equal(ret, nopoll_true);
-    assert_string_equal(get_cloud_status(), CLOUD_STATUS_ONLINE);
+    assert_string_equal(get_parodus_cfg()->cloud_status, CLOUD_STATUS_ONLINE);
    free(cfg);
    if (g_jwt_server_ip !=NULL)
    {
--- a/tests/test_crud_interface.c
+++ b/tests/test_crud_interface.c
@@ -125,10 +125,6 @@ int processCrudRequest(wrp_msg_t *reqMsg, wrp_msg_t **responseMsg )
 	return (int)mock();
 }

-char* getWebpaInterface(void)
-{
-   return NULL;
-}
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/
--- a/tests/test_crud_internal.c
+++ b/tests/test_crud_internal.c
@@ -32,10 +32,8 @@
 #include "../src/connection.h"
 #include "../src/close_retry.h"

-char *get_global_reconnect_reason()
-{
-    return "parodus_stopping";
-}
+bool LastReasonStatus;
+pthread_mutex_t close_mut;

 void set_global_reconnect_reason(char *reason)
 {
@@ -1530,7 +1528,7 @@ void test_retrieveObject_cloud_status()
 	ret = retrieveObject(reqMsg, &respMsg);
 	assert_int_equal (respMsg->u.crud.status, 200);
 	assert_int_equal (ret, 0);
-	assert_string_equal(get_cloud_status(), CLOUD_STATUS_ONLINE);
+	assert_string_equal(get_parodus_cfg()->cloud_status, CLOUD_STATUS_ONLINE);
 	assert_int_equal (respMsg->u.crud.payload_size, 25);

 	fp = fopen(cfg.crud_config_file, "r");
--- a/tests/test_downstream.c
+++ b/tests/test_downstream.c
@@ -64,18 +64,7 @@ reg_list_item_t * get_global_node(void)
 void release_global_node (void)
 {
 }
-void addToCloudAckQ(char *transaction_id, int qos, int rdr)
-{
-	(void)transaction_id;
-	(void)qos;
-	(void)rdr;
-	return;
-}
-bool highQosValueCheck(int qos)
-{
-	(void)qos;
-	return false;
-}
+
 ssize_t wrp_to_struct( const void *bytes, const size_t length,
                       const enum wrp_format fmt, wrp_msg_t **msg )
 {
--- a/tests/test_downstream_more.c
+++ b/tests/test_downstream_more.c
@@ -192,20 +192,6 @@ int validate_partner_id(wrp_msg_t *msg, partners_t **partnerIds)
    return 1;
 }

-void addToCloudAckQ(char *transaction_id, int qos, int rdr)
-{
-	(void)transaction_id;
-	(void)qos;
-	(void)rdr;
-	return;
-}
-
-bool highQosValueCheck(int qos)
-{
-	(void)qos;
-	return false;
-}
-
 ssize_t wrp_to_struct( const void *bytes, const size_t length, const enum wrp_format fmt,
                       wrp_msg_t **msg )
 {
--- a/tests/test_heartBeatTimer.c
+++ b/tests/test_heartBeatTimer.c
@@ -79,6 +79,7 @@ void test_mutexHeartBeatTimer() {
 	ParodusInfo("heartBeatTimer reset to: %d\n", heartBeatTimer);
 	assert_int_equal(heartBeatTimer, 0);
 }
+
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
--- a/tests/test_nopoll_handlers.c
+++ b/tests/test_nopoll_handlers.c
@@ -21,18 +21,17 @@
 #include <nopoll_private.h>
 #include <pthread.h>

-#include "../src/ParodusInternal.h"
 #include "../src/nopoll_handlers.h"
 #include "../src/parodus_log.h"

 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
+volatile unsigned int heartBeatTimer;
 bool LastReasonStatus;
-bool interface_down_event = false;
 int closeReason = 0;
-pthread_mutex_t interface_down_mut=PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t interface_down_con=PTHREAD_COND_INITIALIZER;
+pthread_mutex_t close_mut;
+bool close_retry;
 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/
@@ -47,24 +46,6 @@ bool get_global_reconnect_status()
    return LastReasonStatus;
 }

-void set_interface_down_event()
-{
-        interface_down_event = true;
-}
-
-void reset_interface_down_event() 
-{
-	pthread_mutex_lock (&interface_down_mut);
-	interface_down_event = false;
-	pthread_cond_signal(&interface_down_con);
-	pthread_mutex_unlock (&interface_down_mut);
-}
-
-bool get_interface_down_event() 
-{
-	return interface_down_event;
-}
-
 void set_global_reconnect_status(bool status)
 {
    (void) status ;
@@ -198,30 +179,6 @@ void test_listenerOnPingMessage()
    listenerOnPingMessage(NULL, NULL, NULL, NULL);
 }

-void test_getInterfaceDownEvent()
-{   
-    set_interface_down_event();
-    CU_ASSERT_TRUE(get_interface_down_event());
-}
-
-void test_interfaceDownEvent()
-{
-    char str[] = "SSL_Socket_Close";
-    set_global_reconnect_status(true);
-    set_interface_down_event();
-    listenerOnCloseMessage(NULL, NULL, (noPollPtr) str);
-    
-}
-
-void test_noInterfaceDownEvent()
-{
-    char str[] = "SSL_Socket_Close";
-    set_global_reconnect_status(true);
-    reset_interface_down_event();
-    listenerOnCloseMessage(NULL, NULL, (noPollPtr) str);
-}
-
-
 void add_suites( CU_pSuite *suite )
 {
    ParodusInfo("--------Start of Test Cases Execution ---------\n");
@@ -229,9 +186,6 @@ void add_suites( CU_pSuite *suite )
    CU_add_test( *suite, "Test 1", test_listenerOnMessage_queue );
    CU_add_test( *suite, "Test 2", test_listenerOnCloseMessage );
    CU_add_test( *suite, "Test 3", test_listenerOnPingMessage );
-    CU_add_test( *suite, "Test 4", test_getInterfaceDownEvent );
-    CU_add_test( *suite, "Test 5", test_interfaceDownEvent );
-    CU_add_test( *suite, "Test 6", test_noInterfaceDownEvent );
 }

 /*----------------------------------------------------------------------------*/
--- a/tests/test_nopoll_handlers_fragment.c
+++ b/tests/test_nopoll_handlers_fragment.c
@@ -30,7 +30,10 @@
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
+volatile unsigned int heartBeatTimer;
 bool LastReasonStatus;
+pthread_mutex_t close_mut;
+bool close_retry;
 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/
@@ -45,11 +48,6 @@ bool get_global_reconnect_status()
    return LastReasonStatus;
 }

-bool get_interface_down_event()
-{
-     return false;
-}
-
 void set_global_reconnect_status(bool status)
 {
    (void) status ;
@@ -68,6 +66,7 @@ nopoll_bool nopoll_msg_is_final(noPollMsg *msg)
    function_called();
    return (nopoll_bool) mock();
 }
+
 const unsigned char *nopoll_msg_get_payload(noPollMsg *msg)
 {
 	(void)msg;
--- a/tests/test_nopoll_helpers.c
+++ b/tests/test_nopoll_helpers.c
@@ -16,17 +16,12 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdbool.h>
 #include <setjmp.h>
 #include <cmocka.h>
 #include <nopoll.h>

 #include "../src/parodus_log.h"
 #include "../src/nopoll_helpers.h"
-#include "../src/config.h"
-#include <cjwt/cjwt.h>
-#include "../src/connection.h"
-#include "../src/ParodusInternal.h"

 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */
@@ -36,8 +31,7 @@
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
- static noPollConn *conn = NULL;
- 
+ static noPollConn *conn;
 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/
@@ -122,12 +116,6 @@ int kill(pid_t pid, int sig)
    return (int) mock();
 }

-bool get_interface_down_event()
-{
-     return false;
-}
-
-
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/
@@ -218,7 +206,13 @@ void test_sendMessage()
 {
    int len = strlen("Hello Parodus!");
    
-    get_parodus_cfg()->cloud_status = CLOUD_STATUS_ONLINE;
+    expect_value(nopoll_conn_is_ok, (intptr_t)conn, (intptr_t)conn);
+    will_return(nopoll_conn_is_ok, nopoll_true);
+    expect_function_call(nopoll_conn_is_ok);
+    
+    expect_value(nopoll_conn_is_ready, (intptr_t)conn, (intptr_t)conn);
+    will_return(nopoll_conn_is_ready, nopoll_true);
+    expect_function_call(nopoll_conn_is_ready);
    
    expect_value(__nopoll_conn_send_common, (intptr_t)conn, (intptr_t)conn);
    expect_value(__nopoll_conn_send_common, length, len);
@@ -228,21 +222,81 @@ void test_sendMessage()
    sendMessage(conn, "Hello Parodus!", len);
 }

-void test_sendMessageOffline()
+void connStuck_sendMessage()
 {
-    int len = strlen("Hello Parodus!");
-    
-    get_parodus_cfg()->cloud_status = CLOUD_STATUS_OFFLINE;
+   int len = strlen("Hello Parodus!");
+
+    /* Initialize the timer when connection gets stuck */
+    expect_value(nopoll_conn_is_ok, (intptr_t)conn, (intptr_t)NULL);
+    will_return(nopoll_conn_is_ok, nopoll_false);
+    expect_function_call(nopoll_conn_is_ok);
+
+    expect_function_call(getCurrentTime);
+    sendMessage(NULL, "Hello Parodus!", len);
+
+    /* When connection recovers within 10 mins, it should be able to re-connect */
+    expect_value(nopoll_conn_is_ok, (intptr_t)conn, (intptr_t)NULL);
+    will_return(nopoll_conn_is_ok, nopoll_false);
+    expect_function_call(nopoll_conn_is_ok);
+
+    expect_function_call(getCurrentTime);
+
+    will_return(timeValDiff, 5*60*1000);
+    expect_function_call(timeValDiff);
+
+    expect_value(nopoll_conn_is_ok, (intptr_t)conn, (intptr_t)conn);
+    will_return(nopoll_conn_is_ok, nopoll_true);
+    expect_function_call(nopoll_conn_is_ok);
+
+    expect_value(nopoll_conn_is_ready, (intptr_t)conn, (intptr_t)conn);
+    will_return(nopoll_conn_is_ready, nopoll_true);
+    expect_function_call(nopoll_conn_is_ready);
+
+    expect_value(__nopoll_conn_send_common, (intptr_t)conn, (intptr_t)conn);
+    expect_value(__nopoll_conn_send_common, length, len);
+    will_return(__nopoll_conn_send_common, len);
+    expect_function_calls(__nopoll_conn_send_common, 1);
+
    sendMessage(conn, "Hello Parodus!", len);
-    
+
+    /* When timer exceeds more than 10 mins kill the process */
+    expect_value(nopoll_conn_is_ok, (intptr_t)conn, (intptr_t)NULL);
+    will_return(nopoll_conn_is_ok, nopoll_false);
+    expect_function_call(nopoll_conn_is_ok);
+
+    sendMessage(NULL, "Hello Parodus!", len);
+
+    expect_function_call(getCurrentTime);
+
+    sendMessage(NULL, "Hello Parodus!", len);
+
+    expect_value(nopoll_conn_is_ok, (intptr_t)conn, (intptr_t)NULL);
+    will_return(nopoll_conn_is_ok, nopoll_false);
+    expect_function_call(nopoll_conn_is_ok);
+
+    expect_function_call(getCurrentTime);
+
+    will_return(timeValDiff, 10*60*1000);
+    expect_function_call(timeValDiff);
+
+    will_return(kill, 1);
+    expect_function_call(kill);
+
+    sendMessage(NULL, "Hello Parodus!", len);
 }

 void err_sendMessage()
 {
    int len = strlen("Hello Parodus!");
    
-    get_parodus_cfg()->cloud_status = CLOUD_STATUS_ONLINE;
-
+    expect_value(nopoll_conn_is_ok, (intptr_t)conn, (intptr_t)conn);
+    will_return(nopoll_conn_is_ok, nopoll_true);
+    expect_function_call(nopoll_conn_is_ok);
+    
+    expect_value(nopoll_conn_is_ready, (intptr_t)conn, (intptr_t)conn);
+    will_return(nopoll_conn_is_ready, nopoll_true);
+    expect_function_call(nopoll_conn_is_ready);
+    
    expect_value(__nopoll_conn_send_common, (intptr_t)conn,(intptr_t) conn);
    expect_value(__nopoll_conn_send_common, length, len);
    will_return(__nopoll_conn_send_common, len-2);
@@ -260,12 +314,11 @@ void err_sendMessageConnNull()
 {
    int len = strlen("Hello Parodus!");
    
-    get_parodus_cfg()->cloud_status = CLOUD_STATUS_ONLINE;
+    expect_value(nopoll_conn_is_ok, (intptr_t)conn, (intptr_t)NULL);
+    will_return(nopoll_conn_is_ok, nopoll_false);
+    expect_function_call(nopoll_conn_is_ok);

-    expect_value(__nopoll_conn_send_common, (intptr_t)conn, NULL);
-    expect_value(__nopoll_conn_send_common, length, len);
-    will_return(__nopoll_conn_send_common, len);
-    expect_function_calls(__nopoll_conn_send_common, 1);
+    expect_function_call(getCurrentTime);

    sendMessage(NULL, "Hello Parodus!", len);
 }
@@ -290,7 +343,7 @@ int main(void)
        cmocka_unit_test(err_sendResponseFlushWrites),
        cmocka_unit_test(err_sendResponseConnNull),
        cmocka_unit_test(test_sendMessage),
-        cmocka_unit_test(test_sendMessageOffline),
+        cmocka_unit_test(connStuck_sendMessage),
        cmocka_unit_test(err_sendMessage),
        cmocka_unit_test(err_sendMessageConnNull),
        cmocka_unit_test(test_reportLog),
--- a/tests/test_service_alive.c
+++ b/tests/test_service_alive.c
@@ -32,7 +32,6 @@ static void *client_rcv_task();
 static void *keep_alive_thread();
 static void add_client();
 int sock1;
-int numLoops;
 pthread_t threadId;
 pthread_mutex_t crud_mut=PTHREAD_MUTEX_INITIALIZER;
 pthread_cond_t crud_con=PTHREAD_COND_INITIALIZER;
--- a/tests/test_token.c
+++ b/tests/test_token.c
@@ -160,7 +160,6 @@ extern unsigned int get_algo_mask (const char *algo_str);

 pthread_mutex_t crud_mut=PTHREAD_MUTEX_INITIALIZER;
 pthread_cond_t crud_con=PTHREAD_COND_INITIALIZER;
-int numLoops;

 pthread_cond_t *get_global_crud_con(void)
 {
--- a/tests/test_token_stub.c
+++ b/tests/test_token_stub.c
@@ -26,12 +26,12 @@
 #include <pthread.h>
 #include "../src/token.h"

-int numLoops;

 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/

+
 pthread_mutex_t crud_mut=PTHREAD_MUTEX_INITIALIZER;
 pthread_cond_t crud_con=PTHREAD_COND_INITIALIZER;

--- a/tests/test_upstream.c
+++ b/tests/test_upstream.c
@@ -44,12 +44,10 @@ extern size_t metaPackSize;
 extern UpStreamMsg *UpStreamMsgQ;
 int numLoops = 1;
 int deviceIDNull =0;
-char webpa_interface[64]={'\0'};
 wrp_msg_t *temp = NULL;
 extern pthread_mutex_t nano_mut;
 extern pthread_cond_t nano_con;
 static int crud_test = 0;
-pthread_mutex_t config_mut=PTHREAD_MUTEX_INITIALIZER;
 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/
@@ -118,27 +116,6 @@ ParodusCfg *get_parodus_cfg(void)
    return &parodusCfg;
 }

-char *getWebpaInterface(void)
-{
-    ParodusCfg cfg;
-    memset(&cfg,0,sizeof(cfg));
-    #ifdef WAN_FAILOVER_SUPPORTED
-        parStrncpy(cfg.webpa_interface_used , "wl0", sizeof(cfg.webpa_interface_used));
-    #else
-        parStrncpy(cfg.webpa_interface_used , "eth0", sizeof(cfg.webpa_interface_used));
-    #endif
-    set_parodus_cfg(&cfg);
-    #ifdef WAN_FAILOVER_SUPPORTED	
-	ParodusPrint("WAN_FAILOVER_SUPPORTED mode \n");
-	pthread_mutex_lock (&config_mut);	
-	parStrncpy(webpa_interface, get_parodus_cfg()->webpa_interface_used, sizeof(webpa_interface));
-	pthread_mutex_unlock (&config_mut);
-    #else
-	parStrncpy(webpa_interface, get_parodus_cfg()->webpa_interface_used, sizeof(webpa_interface));
-    #endif
-	return webpa_interface;
-}
-
 ssize_t wrp_pack_metadata( const data_t *packData, void **data )
 {
    (void) packData; (void) data;
--- a/tests/test_upstream_sock.c
+++ b/tests/test_upstream_sock.c
@@ -46,11 +46,10 @@ extern size_t metaPackSize;
 extern UpStreamMsg *UpStreamMsgQ;
 int numLoops = 1;
 int deviceIDNull =0;
-char webpa_interface[64]={'\0'};
 wrp_msg_t *reg_msg = NULL;
 extern pthread_mutex_t nano_mut;
 extern pthread_cond_t nano_con;
-pthread_mutex_t config_mut=PTHREAD_MUTEX_INITIALIZER;
+
 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/
@@ -102,27 +101,6 @@ ParodusCfg *get_parodus_cfg(void)
    return &parodusCfg;
 }

-char *getWebpaInterface(void)
-{
-    ParodusCfg cfg;
-    memset(&cfg,0,sizeof(cfg));
-    #ifdef WAN_FAILOVER_SUPPORTED
-        parStrncpy(cfg.webpa_interface_used , "wl0", sizeof(cfg.webpa_interface_used));
-    #else
-        parStrncpy(cfg.webpa_interface_used , "eth0", sizeof(cfg.webpa_interface_used));
-    #endif
-    set_parodus_cfg(&cfg);
-    #ifdef WAN_FAILOVER_SUPPORTED	
-	ParodusPrint("WAN_FAILOVER_SUPPORTED mode \n");
-	pthread_mutex_lock (&config_mut);	
-	parStrncpy(webpa_interface, get_parodus_cfg()->webpa_interface_used, sizeof(webpa_interface));
-	pthread_mutex_unlock (&config_mut);
-    #else
-	parStrncpy(webpa_interface, get_parodus_cfg()->webpa_interface_used, sizeof(webpa_interface));
-    #endif
-	return webpa_interface;
-}
-
 /*-------------------------------------------
 int nn_connect (int s, const char *addr)
 {