Merge pull request #304 from bill1600/clrtoken3p4

clr auth token if fetch fails
2026-01-27 18:20:04 +00:00 · 2019-05-15 20:05:05 -07:00 · 2019-05-14 16:25:34 -07:00 · 2019-04-02 23:00:02 -07:00 · 2019-04-02 22:59:50 -07:00 · 2019-04-02 22:59:29 -07:00
57 changed files with 626 additions and 3140 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,71 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Comcast Cable Communications Management, LLC
-# SPDX-License-Identifier: Apache-2.0
-
-name: CI
-
-on:
-  pull_request_target:
-  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@v3
-        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:  Install sonar-scanner and build-wrapper
-        uses: sonarsource/sonarcloud-github-c-cpp@v2
-        
-      - 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-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@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
-        with:
-          directory:        .
-          flags:            unittests
-          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
@@ -4,49 +4,6 @@ All notable changes to this project will be documented in this file.
 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]
-
-## [v1.1.5]
- Add additional HTTP headers for call to Themis from Convey
- Change default branch name to `main`
-
-## [v1.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]
- 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
-
 ## [1.0.2] - 2019-02-08
 - Refactored connection.c and updated corresponding unit tests
 - Additional `/cloud-status` and `/cloud-disconnect` fields.
@@ -95,7 +52,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,14 +61,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/v1.1.5...HEAD
-[1.1.5]: https://github.com/Comcast/parodus/compare/v1.1.4...v1.1.5
-[1.1.4]: https://github.com/Comcast/parodus/compare/1.1.3...v1.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.5)
 project(parodus)

 include(ExternalProject)
@@ -35,7 +34,6 @@ include_directories(${INCLUDE_DIR}
                    ${INCLUDE_DIR}/cjson
                    ${INCLUDE_DIR}/nopoll
                    ${INCLUDE_DIR}/msgpack
-	            ${INCLUDE_DIR}/curl
                    ${INCLUDE_DIR}/trower-base64
                    ${INCLUDE_DIR}/wrp-c                   
                    ${INCLUDE_DIR}/libparodus
@@ -86,7 +84,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.2"
+    GIT_TAG "1.0.1"
    CONFIGURE_COMMAND COMMAND <SOURCE_DIR>/autogen.sh --prefix=${PREFIX}
                                                     --includedir=${INCLUDE_DIR}
                                                     --libdir=${LIBRARY_DIR}
@@ -102,7 +100,7 @@ add_dependencies(libnopoll nopoll)
 ExternalProject_Add(nanomsg
    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/nanomsg
    GIT_REPOSITORY https://github.com/nanomsg/nanomsg.git
-    GIT_TAG "1.1.4"
+    GIT_TAG "1.1.2"
    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
 )
 add_library(libnanomsg STATIC SHARED IMPORTED)
@@ -136,24 +134,12 @@ add_library(libmsgpack STATIC SHARED IMPORTED)
 add_dependencies(libmsgpack msgpack)


-# curl external dependency
-#-------------------------------------------------------------------------------
-ExternalProject_Add(curl
-    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/curl
-    GIT_REPOSITORY https://github.com/curl/curl.git
-    GIT_TAG "curl-7_63_0"
-    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_TESTING=OFF
-)
-add_library(libcurl STATIC SHARED IMPORTED)
-add_dependencies(libcurl curl)
-
-
 # cimplog external dependency
 #-------------------------------------------------------------------------------
 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)
--- 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
@@ -61,9 +55,9 @@ make test

 - /force-ipv6 -Forcefully connect parodus to ipv6 address (optional argument)

- /client-cert-path -MTLS client cert location to request auth token for establishing secure connection [absolute path where client cert is present] (optional argument)
+- /token-read-script -Script to get auth token for establishing secure connection (absolute path where that script is present) -optional argument

- /token-server-url -complete server url with API path to request new auth token for establishing secure connection (optional argument)
+- /token-acquisition-script -Script to create new auth token for establishing secure connection (absolute path where that script is present) -optional argument 

 - /crud-config-file -Config json file to store objects during create, retrieve, update and delete (CRUD) operations -optional argument 

@@ -81,12 +75,6 @@ make test

 - /jwt-public-key-file -JWT token validation key

-# if ENABLE_MUTUAL_AUTH is enabled
-
- /mtls-client-cert-path - Provide the client cert for establishing a mutual auth secure websocket connection
-
- /mtls-client-key-path - Provide the client cert key for establishing a mutual auth secure websocket connection
-
 ```

 # Sample parodus start commands:
@@ -94,17 +82,17 @@ make test
 ```
 # Seshat & FEATURE_DNS_QUERY Enabled

-./parodus --hw-model=TGXXX --hw-serial-number=E8GBUEXXXXXXXXX --hw-manufacturer=ARRIS --hw-mac=14cfexxxxxxx --hw-last-reboot-reason=unknown --fw-name=TG1682_DEV_master_20170512115046sdy --boot-time=1494590301 --webpa-ping-timeout=180 --webpa-interface-used=eth0 --webpa-url=https://somebody.net:8080 --webpa-backoff-max=9 --parodus-local-url=tcp://127.0.0.1:6666 --partner-id=comcast --ssl-cert-path=/etc/ssl/certs/ca-certificates.crt --acquire-jwt=1 --dns-txt-url=somebody.net --jwt-public-key-file=webpa-rs256.pem --jwt-algo=RS256 --seshat-url=tcp://127.0.0.1:7777 --client-cert-path=/tmp/clientcert.mch --token-server-url=https://somebody.net:8080/token --force-ipv4 --crud-config-file=/tmp/parodus_cfg.json
+./parodus --hw-model=TGXXX --hw-serial-number=E8GBUEXXXXXXXXX --hw-manufacturer=ARRIS --hw-mac=14cfexxxxxxx --hw-last-reboot-reason=unknown --fw-name=TG1682_DEV_master_20170512115046sdy --boot-time=1494590301 --webpa-ping-timeout=180 --webpa-interface-used=eth0 --webpa-url=somebody.net:8080 --webpa-backoff-max=9 --parodus-local-url=tcp://127.0.0.1:6666 --partner-id=comcast --ssl-cert-path=/etc/ssl/certs/ca-certificates.crt --acquire-jwt=1 --dns-txt-url=somebody.net --jwt-public-key-file=webpa-rs256.pem --jwt-algo=RS256 --seshat-url=tcp://127.0.0.1:7777 --token-read-script=/usr/ccsp/parodus/parodus_token1.sh --token-acquisition-script=/usr/ccsp/parodus/parodus_token2.sh --force-ipv4 --crud-config-file=/tmp/parodus_cfg.json


 # Seshat is not enabled

-./parodus --hw-model=TGXXX --hw-serial-number=E8GBUEXXXXXXXXX --hw-manufacturer=ARRIS --hw-mac=14cfexxxxxxx --hw-last-reboot-reason=unknown --fw-name=TG1682_DEV_master_20170512115046sdy --boot-time=1494590301 --webpa-ping-timeout=180 --webpa-interface-used=eth0 --webpa-url=https://somebody.net:8080 --webpa-backoff-max=9 --parodus-local-url=tcp://127.0.0.1:6666 --partner-id=comcast --ssl-cert-path=/etc/ssl/certs/ca-certificates.crt --acquire-jwt=1 --dns-txt-url=somebody.net --jwt-public-key-file=webpa-rs256.pem --jwt-algo=RS256 --client-cert-path=/tmp/clientcert.mch --token-server-url=https://somebody.net:8080/token --force-ipv4 --crud-config-file=/tmp/parodus_cfg.json
+./parodus --hw-model=TGXXX --hw-serial-number=E8GBUEXXXXXXXXX --hw-manufacturer=ARRIS --hw-mac=14cfexxxxxxx --hw-last-reboot-reason=unknown --fw-name=TG1682_DEV_master_20170512115046sdy --boot-time=1494590301 --webpa-ping-timeout=180 --webpa-interface-used=eth0 --webpa-url=somebody.net:8080 --webpa-backoff-max=9 --parodus-local-url=tcp://127.0.0.1:6666 --partner-id=comcast --ssl-cert-path=/etc/ssl/certs/ca-certificates.crt --acquire-jwt=1 --dns-txt-url=somebody.net --jwt-public-key-file=webpa-rs256.pem --jwt-algo=RS256 --token-read-script=/usr/ccsp/parodus/parodus_token1.sh --token-acquisition-script=/usr/ccsp/parodus/parodus_token2.sh --force-ipv4 --crud-config-file=/tmp/parodus_cfg.json


 # When both Seshat & FEATURE_DNS_QUERY not Enabled

-./parodus --hw-model=TGXXX --hw-serial-number=E8GBUEXXXXXXXXX --hw-manufacturer=ARRIS --hw-mac=14cfexxxxxxx --hw-last-reboot-reason=unknown --fw-name=TG1682_DEV_master_20170512115046sdy --boot-time=1494590301 --webpa-ping-timeout=180 --webpa-interface-used=eth0 --webpa-url=https://somebody.net:8080 --webpa-backoff-max=9 --parodus-local-url=tcp://127.0.0.1:6666 --partner-id=comcast --ssl-cert-path=/etc/ssl/certs/ca-certificates.crt --client-cert-path=/tmp/clientcert.mch --token-server-url=https://somebody.net:8080/token --force-ipv4 --crud-config-file=/tmp/parodus_cfg.json
+./parodus --hw-model=TGXXX --hw-serial-number=E8GBUEXXXXXXXXX --hw-manufacturer=ARRIS --hw-mac=14cfexxxxxxx --hw-last-reboot-reason=unknown --fw-name=TG1682_DEV_master_20170512115046sdy --boot-time=1494590301 --webpa-ping-timeout=180 --webpa-interface-used=eth0 --webpa-url=somebody.net:8080 --webpa-backoff-max=9 --parodus-local-url=tcp://127.0.0.1:6666 --partner-id=comcast --ssl-cert-path=/etc/ssl/certs/ca-certificates.crt --token-read-script=/usr/ccsp/parodus/parodus_token1.sh --token-acquisition-script=/usr/ccsp/parodus/parodus_token2.sh --force-ipv4 --crud-config-file=/tmp/parodus_cfg.json

 ```

--- 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)

 if (ENABLE_SESHAT)
 set(SOURCES ${SOURCES} seshat_interface.c)
@@ -30,7 +30,6 @@ target_link_libraries (parodus
    ${CMAKE_THREAD_LIBS_INIT}
    -lwrp-c
    -lmsgpackc
-    -lcurl
    -ltrower-base64
    -lnopoll
    -luuid
--- 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                             */
 /*----------------------------------------------------------------------------*/
@@ -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,30 +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);

-
-/*------------------------------------------------------------------------------*/
-/*                        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();
-  
-
 #ifdef __cplusplus
 }
 #endif
--- a/src/auth_token.c
+++ b/src/auth_token.c
@@ -1,320 +0,0 @@
-/**
- * Copyright 2015 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 auth_token.c
- *
- * @description This file is to fetch authorization token during parodus cloud connection.
- *
- */
-
-#include <stdio.h>
-#include <fcntl.h> 
-#include "config.h"
-#include "connection.h"
-#include "auth_token.h"
-#include "ParodusInternal.h"
-#include <cjwt/cjwt.h>
-#include <stdlib.h>
-#include <curl/curl.h>
-#include <uuid/uuid.h>
-
-#define MAX_BUF_SIZE	        256
-#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;
-/*----------------------------------------------------------------------------*/
-/*                             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
-* @param[in] len total token size
-* @param[in] r_count Number of curl retries on ipv4 and ipv6 mode during failure
-* @return returns 0 if success, otherwise failed to fetch auth token and will be retried.
-*/
-
-int requestNewAuthToken(char *newToken, size_t len, int r_count)
-{
-	CURL *curl;
-	CURLcode res;
-	CURLcode time_res;
-	struct curl_slist *list = NULL;
-	struct curl_slist *headers_list = NULL;
-
-	double total;
-
-	struct token_data data;
-	data.size = 0;
-	data.data = newToken;
-
-	curl = curl_easy_init();
-	if(curl)
-	{
-		data.data[0] = '\0';
-
-		createCurlheader(list, &headers_list);
-
-		curl_easy_setopt(curl, CURLOPT_URL, get_parodus_cfg()->token_server_url);
-		curl_easy_setopt(curl, CURLOPT_TIMEOUT, CURL_TIMEOUT_SEC);
-
-		if(get_parodus_cfg()->webpa_interface_used !=NULL && strlen(get_parodus_cfg()->webpa_interface_used) >0)
-		{
-			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);
-		curl_easy_setopt(curl, CURLOPT_WRITEDATA, &data);
-
-		curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers_list);
-
-		/* setting curl resolve option as default mode.
-		If any failure, retry with v4 first and then v6 mode. */
-
-		if(r_count == 1)
-		{
-			ParodusInfo("curl Ip resolve option set as V4 mode\n");
-			curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
-		}
-		else if(r_count == 2)
-		{
-			ParodusInfo("curl Ip resolve option set as V6 mode\n");
-			curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V6);
-		}
-		else
-		{
-			ParodusInfo("curl Ip resolve option set as default mode\n");
-			curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_WHATEVER);
-		}
-
-		/* set the cert for client authentication */
-		curl_easy_setopt(curl, CURLOPT_SSLCERT, get_parodus_cfg()->client_cert_path);
-
-		curl_easy_setopt(curl, CURLOPT_CAINFO, get_parodus_cfg()->cert_path);
-
-		/* disconnect if it is failed to validate server's cert */
-		curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1L);
-
-		/* 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);
-
-		time_res = curl_easy_getinfo(curl, CURLINFO_TOTAL_TIME, &total);
-		if(time_res == 0)
-		{
-			ParodusInfo("curl response Time: %.1f seconds\n", total);
-		}
-		curl_slist_free_all(headers_list);
-		if(res != 0)
-		{
-			ParodusError("curl_easy_perform() failed: %s\n", curl_easy_strerror(res));
-			curl_easy_cleanup(curl);
-			data.size = 0;
-			memset (data.data, 0, len);
-			return -1;
-		}
-		else
-		{
-			if(getGlobalResponseCode() == 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);
-	}
-	else
-	{
-		ParodusError("curl init failure\n");
-		data.size = 0;
-		memset (data.data, 0, len);
-		return -1;
-	}
-
-	return 0;
-}
-
-/*
-* @brief Fetches authorization token and update to parodus config.
-  This will do curl retry in case of any failure till it reaches max curl retry count.
- * @param[in] cfg Global parodus config structure to update webpa_auth_token
-*/
-
-void getAuthToken(ParodusCfg *cfg)
-{
-	int status = -1;
-	int retry_count = 0;
-
-	memset (cfg->webpa_auth_token, 0, sizeof(cfg->webpa_auth_token));
-	if( cfg->hw_mac != NULL && strlen(cfg->hw_mac) !=0 )
-	{
-		if( cfg->client_cert_path !=NULL && strlen(cfg->client_cert_path) !=0 )
-		{
-			while(1)
-			{
-				//Fetch new auth token using libcurl
-				status = requestNewAuthToken(cfg->webpa_auth_token, sizeof(cfg->webpa_auth_token), retry_count);
-				if(status == 0)
-				{
-					ParodusInfo("cfg->webpa_auth_token created successfully\n");
-					break;
-				}
-				else
-				{
-					ParodusError("Failed to create new token\n");
-					retry_count++;
-					ParodusError("Curl execution is failed, retry attempt: %d\n", retry_count);
-				}
-
-				if(retry_count == MAX_CURL_RETRY_COUNT)
-				{
-					ParodusError("Curl retry is reached to max %d attempts, proceeding without token\n", retry_count);
-					break;
-				}
-			}
-		}
-		else
-		{
-			ParodusError("client_cert_path is NULL, failed to fetch auth token\n");
-		}
-	}
-	else
-	{
-		ParodusError("hw_mac is NULL, failed to fetch auth token\n");
-	}
-}
-
-/* @brief callback function for writing libcurl received data
- * @param[in] buffer curl delivered data which need to be saved.
- * @param[in] size size is always 1
- * @param[in] nmemb size of delivered data
- * @param[out] data curl response data saved.
-*/
-size_t write_callback_fn(void *buffer, size_t size, size_t nmemb, struct token_data *data)
-{
-    ParodusCfg *cfg;
-    size_t max_data_size = sizeof (cfg->webpa_auth_token);
-    size_t index = data->size;
-    size_t n = (size * nmemb);
-
-    data->size += n;
-
-    if (data->size >= max_data_size) {
-        ParodusError("Auth token data overruns buffer\n");
-	data->size = 0;
-        return 0;
-    }
-
-    memcpy((data->data + index), buffer, n);
-    data->data[data->size] = '\0';
-
-    return n;
-}
-
-/* @brief function to generate random uuid.
-*/
-char* generate_trans_uuid()
-{
-	char *transID = NULL;
-	uuid_t transaction_Id;
-	char *trans_id = NULL;
-	trans_id = (char *)malloc(37);
-	uuid_generate_random(transaction_Id);
-	uuid_unparse(transaction_Id, trans_id);
-
-	if(trans_id !=NULL)
-	{
-		transID = trans_id;
-	}
-	return transID;
-}
-
-/* @brief function to create curl header contains mac, serial number and uuid.
- * @param[in] h the auth headers to populate
- * @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)
-{
-    char buf[MAX_BUF_SIZE];
-    char *uuid = 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);
-
-    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", get_parodus_cfg()->webpa_interface_used);
-    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;
-}
--- a/src/auth_token.h
+++ b/src/auth_token.h
@@ -1,57 +0,0 @@
-/**
- * Copyright 2015 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 auth_token.h
- *
- * @description This file is to fetch authorization token during parodus cloud connection.
- *
- */
- 
-#ifndef _AUTH_TOKEN_H_ 
-#define _AUTH_TOKEN_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*----------------------------------------------------------------------------*/
-/*                                   Macros                                   */
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/*                               Data Structures                              */
-/*----------------------------------------------------------------------------*/
-
-struct token_data {
-    size_t size;
-    char* data;
-};
-
-/*----------------------------------------------------------------------------*/
-/*                             Function Prototypes                            */
-/*----------------------------------------------------------------------------*/
-
-int requestNewAuthToken(char *newToken, size_t len, int r_count);
-void getAuthToken(ParodusCfg *cfg);
-size_t write_callback_fn(void *buffer, size_t size, size_t nmemb, struct token_data *data);
-char* generate_trans_uuid();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
--- 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
@@ -26,9 +26,8 @@
 #include "config.h"
 #include "ParodusInternal.h"
 #include <cjwt/cjwt.h>
-#include <stdlib.h>
-#include <curl/curl.h>
-#include <uuid/uuid.h>
+
+#define MAX_BUF_SIZE	128

 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
@@ -37,6 +36,7 @@
 static ParodusCfg parodusCfg;
 static unsigned int rsa_algorithms = 
 	(1<<alg_rs256) | (1<<alg_rs384) | (1<<alg_rs512);
+
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
@@ -141,6 +141,31 @@ void read_key_from_file (const char *fname, char *buf, size_t buflen)
  ParodusInfo ("%d bytes read\n", nbytes);
 }

+void execute_token_script(char *token, char *name, size_t len, char *mac, char *serNum)
+{
+    FILE* out = NULL, *file = NULL;
+    char command[MAX_BUF_SIZE] = {'\0'};
+    if(strlen(name)>0)
+    {
+        file = fopen(name, "r");
+        if(file)
+        {
+            snprintf(command,sizeof(command),"%s %s %s",name,serNum,mac);
+            out = popen(command, "r");
+            if(out)
+            {
+                fgets(token, len, out);
+                pclose(out);
+            }
+            fclose(file);
+        }
+        else
+        {
+            ParodusError ("File %s open error\n", name);
+        }
+    }
+}
+
 // strips ':' characters
 // verifies that there exactly 12 characters
 int parse_mac_address (char *target, const char *arg)
@@ -214,13 +239,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
@@ -366,14 +386,10 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
        {"ssl-cert-path",           required_argument, 0, 'c'},
        {"force-ipv4",              no_argument,       0, '4'},
        {"force-ipv6",              no_argument,       0, '6'},
+        {"token-read-script",       required_argument, 0, 'T'},
        {"boot-time-retry-wait",    required_argument, 0, 'w'},
-	{"client-cert-path",        required_argument, 0, 'P'},
-	{"token-server-url",        required_argument, 0, 'U'},
+	{"token-acquisition-script",     required_argument, 0, 'J'},
 	{"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}
    };
    int c;
@@ -389,10 +405,6 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
 	cfg->jwt_algo = 0;
 	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;
 	cfg->cloud_disconnect = NULL;
 	optind = 1;  /* We need this if parseCommandLine is called again */
@@ -401,9 +413,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: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",
+				long_options, &option_index);

      /* Detect the end of the options. */
      if (c == -1)
@@ -443,7 +454,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':
@@ -536,45 +546,23 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
          cfg->flags |= FLAGS_IPV6_ONLY;
          break;

+        case 'J':
+          parStrncpy(cfg->token_acquisition_script, optarg,sizeof(cfg->token_acquisition_script));
+          break;
+        
+        case 'T':
+          parStrncpy(cfg->token_read_script, optarg,sizeof(cfg->token_read_script));
+          break;
+
        case 'w':
          cfg->boot_retry_wait = parse_num_arg (optarg, "boot-time-retry-wait");
          ParodusInfo("boot_retry_wait is %d\n",cfg->boot_retry_wait);
          break;

-	case 'S':
-	  cfg->connection_health_file = strdup(optarg);
-	  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':
-		cfg->client_cert_path = strdup(optarg);
-		ParodusInfo("client_cert_path is %s\n", cfg->client_cert_path);
-		break;
-
-	case 'U':
-		cfg->token_server_url = strdup(optarg);
-		ParodusInfo("token_server_url is %s\n", cfg->token_server_url);
-		break;
-
-        case 'K':
-          cfg->mtls_client_key_path = strdup(optarg);
-          ParodusInfo("mtls_client_key_path is %s\n", cfg->mtls_client_key_path);
-          break;
-
-	case 'M':
-          cfg->mtls_client_cert_path = strdup(optarg);
-          ParodusInfo("mtls_client_cert_path is %s\n", cfg->mtls_client_cert_path);
-          break;
+		case 'C':
+		  cfg->crud_config_file = strdup(optarg);
+		  ParodusInfo("crud_config_file is %s\n", cfg->crud_config_file);
+		  break;

        case '?':
          /* getopt_long already printed an error message. */
@@ -618,6 +606,64 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
    return 0;
 }

+/*
+* call parodus create/acquisition script to create new auth token, if success then calls 
+* execute_token_script func with args as parodus read script.
+*/
+
+void createNewAuthToken(char *newToken, size_t len)
+{
+	//Call create script
+	char output[12] = {'\0'};
+	memset (newToken, 0, len);
+	execute_token_script(output,get_parodus_cfg()->token_acquisition_script,sizeof(output),get_parodus_cfg()->hw_mac,get_parodus_cfg()->hw_serial_number);
+  	if (strlen(output)>0  && strcmp(output,"SUCCESS")==0)
+	{
+		//Call read script 
+		execute_token_script(newToken,get_parodus_cfg()->token_read_script,len,get_parodus_cfg()->hw_mac,get_parodus_cfg()->hw_serial_number);
+	}	
+	else 
+	{
+		ParodusError("Failed to create new token\n");
+	}
+}
+
+/*
+* Fetches authorization token from the output of read script. If read script returns "ERROR"
+* it will call createNewAuthToken to create and read new token 
+*/
+
+void getAuthToken(ParodusCfg *cfg)
+{
+	//local var to update cfg->webpa_auth_token only in success case
+	char output[4069] = {'\0'} ;
+	memset (cfg->webpa_auth_token, 0, sizeof(cfg->webpa_auth_token));
+	if( strlen(cfg->token_read_script) !=0 && strlen(cfg->token_acquisition_script) !=0)
+    	{
+		execute_token_script(output,cfg->token_read_script,sizeof(output),cfg->hw_mac,cfg->hw_serial_number);
+		
+	    	if ((strlen(output) == 0))
+	    	{
+			ParodusError("Unable to get auth token\n");
+		}
+		else if(strcmp(output,"ERROR")==0)
+		{
+			ParodusInfo("Failed to read token from %s. Proceeding to create new token.\n",cfg->token_read_script);
+			//Call create/acquisition script
+			createNewAuthToken(cfg->webpa_auth_token, sizeof(cfg->webpa_auth_token));	
+		}
+		else
+		{
+			ParodusInfo("update cfg->webpa_auth_token in success case\n");
+			parStrncpy(cfg->webpa_auth_token, output, sizeof(cfg->webpa_auth_token));
+		}
+	}
+	else
+	{
+        	ParodusInfo("Both read and write file are NULL \n");
+	}
+}
+
 void setDefaultValuesToCfg(ParodusCfg *cfg)
 {
    if(cfg == NULL)
@@ -649,10 +695,6 @@ void setDefaultValuesToCfg(ParodusCfg *cfg)
    parStrncpy(cfg->webpa_uuid, "1234567-345456546",sizeof(cfg->webpa_uuid));
    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;
 	
 	cfg->cloud_status = CLOUD_STATUS_OFFLINE;
 	ParodusInfo("Default cloud_status is %s\n", cfg->cloud_status);
@@ -793,6 +835,24 @@ void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg)
        ParodusPrint("cert_path is NULL. set to empty\n");
    }

+    if(strlen(config->token_acquisition_script )!=0)
+    {
+          parStrncpy(cfg->token_acquisition_script, config->token_acquisition_script,sizeof(cfg->token_acquisition_script));
+    }
+    else
+    {
+          ParodusPrint("token_acquisition_script is NULL. read from tmp file\n");
+    }
+        
+    if(strlen(config->token_read_script )!=0)
+    {
+          parStrncpy(cfg->token_read_script, config->token_read_script,sizeof(cfg->token_read_script));
+    }
+    else
+    {
+          ParodusPrint("token_read_script is NULL. read from tmp file\n");
+    }
+
    cfg->boot_time = config->boot_time;
    cfg->webpa_ping_timeout = config->webpa_ping_timeout;
    cfg->webpa_backoff_max = config->webpa_backoff_max;
@@ -802,24 +862,6 @@ void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg)
    parStrncpy(cfg->webpa_uuid, "1234567-345456546",sizeof(cfg->webpa_uuid));
    ParodusPrint("cfg->webpa_uuid is :%s\n", cfg->webpa_uuid);
    
-    if(config->connection_health_file != NULL)
-    {
-        cfg->connection_health_file = strdup(config->connection_health_file);
-    }
-    else
-    {
-        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);
@@ -828,24 +870,6 @@ void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg)
    {
        ParodusPrint("crud_config_file is NULL. set to empty\n");
    }
-
-    if(config->client_cert_path != NULL)
-    {
-        cfg->client_cert_path = strdup(config->client_cert_path);
-    }
-    else
-    {
-        ParodusPrint("client_cert_path is NULL. set to empty\n");
-    }
-
-    if(config->token_server_url != NULL)
-    {
-        cfg->token_server_url = strdup(config->token_server_url);
-    }
-    else
-    {
-        ParodusPrint("token_server_url is NULL. set to empty\n");
-    }
 }


--- a/src/config.h
+++ b/src/config.h
@@ -75,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;
@@ -99,12 +99,6 @@ typedef struct
    char webpa_auth_token[4096];
    char token_acquisition_script[64];
    char token_read_script[64];
-    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;
 	char *cloud_status;
 	char *cloud_disconnect;
@@ -120,6 +114,7 @@ typedef struct
 /*----------------------------------------------------------------------------*/

 void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg);
+void createNewAuthToken(char *newToken, size_t len);

 /**
 * parse command line arguments and create config structure
@@ -133,6 +128,7 @@ void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg);
 int parseCommandLine(int argc,char **argv,ParodusCfg * cfg);

 void setDefaultValuesToCfg(ParodusCfg *cfg); 
+void getAuthToken(ParodusCfg *cfg);
 // Accessor for the global config structure.
 ParodusCfg *get_parodus_cfg(void);
 void set_parodus_cfg(ParodusCfg *);
@@ -153,6 +149,7 @@ void reset_cloud_disconnect_reason(ParodusCfg *cfg);
 */ 
 int parse_webpa_url (const char *full_url, 
 	char **server_addr, unsigned int *port);
+
 #ifdef __cplusplus
 }
 #endif
--- a/src/conn_interface.c
+++ b/src/conn_interface.c
@@ -33,11 +33,9 @@
 #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"
-#include <curl/curl.h>
 #ifdef FEATURE_DNS_QUERY
 #include <ucresolv_log.h>
 #endif
@@ -74,9 +72,7 @@ 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;
    unsigned int webpa_ping_timeout_ms = 1000 * get_parodus_cfg()->webpa_ping_timeout;
    unsigned int heartBeatTimer = 0;
    struct timespec start_svc_alive_timer;
@@ -97,14 +93,9 @@ void createSocketConnection(void (* initKeypress)())
    nopoll_log_set_handler (ctx, __report_log, NULL);
    #endif

-    EventHandler();
-    
-    set_server_list_null (&server_list);
-    create_conn_rtn = createNopollConnection(ctx, &server_list);
-    if(!create_conn_rtn)
+    if(!createNopollConnection(ctx))
    {
 		ParodusError("Unrecovered error, terminating the process\n");
-		OnboardLog("Unrecovered error, terminating the process\n");
 		abort();
    }
    packMetaData();
@@ -148,14 +139,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
@@ -171,17 +156,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);
@@ -193,7 +176,7 @@ void createSocketConnection(void (* initKeypress)())
 		free(get_parodus_cfg()->cloud_disconnect);
 		reset_cloud_disconnect_reason(get_parodus_cfg());
            }
-            createNopollConnection(ctx, &server_list);
+            createNopollConnection(ctx);
        }
       } while(!get_close_retry() && !g_shutdown);

@@ -219,17 +202,12 @@ 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();
 }

-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
@@ -25,7 +25,6 @@
 #include "time.h"
 #include "token.h"
 #include "config.h"
-#include "auth_token.h"
 #include "nopoll_helpers.h"
 #include "mutex.h"
 #include "spin_thread.h"
@@ -38,36 +37,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                           */
 /*----------------------------------------------------------------------------*/

-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;
@@ -90,16 +64,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;
@@ -234,114 +198,23 @@ 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_REALTIME, &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;
-	}
-}
-
-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;
-
-  // periodically update the health file.
-  clock_gettime (CLOCK_REALTIME, &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);
-
-  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;
-  }
-
-  return BACKOFF_DELAY_TAKEN;
+  update_backoff_delay (timer);
+  ParodusInfo("Waiting with backoffRetryTime %d seconds\n", timer->delay);
+  sleep (timer->delay);
 }  

 //--------------------------------------------------------------------
@@ -419,7 +292,18 @@ 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 set_extra_headers (create_connection_ctx_t *ctx, int reauthorize)
+{
+  if (reauthorize && (strlen(get_parodus_cfg()->token_acquisition_script) >0))
+  {
+    createNewAuthToken(get_parodus_cfg()->webpa_auth_token,
+      sizeof(get_parodus_cfg()->webpa_auth_token));
+  }
+  
+  ctx->extra_headers = build_extra_hdrs (&ctx->header_info);
 }

 void free_extra_headers (create_connection_ctx_t *ctx)
@@ -427,26 +311,11 @@ void free_extra_headers (create_connection_ctx_t *ctx)
  FREE_PTR_VAR (ctx->extra_headers)
 }

-void set_extra_headers (create_connection_ctx_t *ctx)
-{
-  ParodusCfg * cfg = get_parodus_cfg();
-
-  free_extra_headers (ctx);
-  if ((strlen(cfg->webpa_auth_token) == 0) &&
-      (cfg->client_cert_path != NULL) && (strlen(cfg->client_cert_path) > 0))
-  {
-    getAuthToken(cfg);
-  }
-  
-  ctx->extra_headers = build_extra_hdrs (&ctx->header_info);
-}
-
 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);
 }


@@ -463,10 +332,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
@@ -484,6 +351,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)
@@ -519,10 +387,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);
 						
@@ -538,14 +404,14 @@ int nopoll_connect (create_connection_ctx_t *ctx, int is_ipv6)
 //--------------------------------------------------------------------
 // Return codes for wait_connection_ready
 #define WAIT_SUCCESS	0
-#define WAIT_ACTION_RETRY	1	// if wait_status is 307, 302, 303, or 403
+#define WAIT_ACTION_RETRY	1	// if wait_status is 307, 302, 303 or 403
 #define WAIT_FAIL 	2

 #define FREE_NON_NULL_PTR(ptr) if (NULL != ptr) free(ptr)

 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, 
@@ -557,12 +423,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;
@@ -574,12 +440,10 @@ int wait_connection_ready (create_connection_ctx_t *ctx)
  FREE_NON_NULL_PTR (redirectURL);
  if(wait_status == 403) 
  {
-    ParodusCfg *cfg = get_parodus_cfg();
-    /* 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("Received Unauthorized response with status: %d\n", wait_status);
+	free_extra_headers (ctx);
+	set_extra_headers (ctx, true);
+	return WAIT_ACTION_RETRY;
  }
  ParodusError("Client connection timeout\n");	
  ParodusError("RDK-10037 - WebPA Connection Lost\n");
@@ -589,9 +453,9 @@ 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_SUCCESS	0
+#define CONN_WAIT_ACTION_RETRY	1	// if wait_status is 307, 302, 303 or 403
+#define CONN_WAIT_RETRY_DNS 	2

 int connect_and_wait (create_connection_ctx_t *ctx)
 {
@@ -622,7 +486,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);
    }

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

@@ -648,61 +512,20 @@ int keep_trying_to_connect (create_connection_ctx_t *ctx,
 {
    int rtn;
    
-    while (!g_shutdown)
+    while (true)
    {
-      set_extra_headers (ctx);
-
      rtn = connect_and_wait (ctx);
      if (rtn == CONN_WAIT_SUCCESS)
        return true;
-
      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 ((rtn != 0) || g_shutdown) {
-	    return -1;
-	  }
-	}
-    return 0;
-}

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

@@ -710,10 +533,11 @@ 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;
@@ -728,60 +552,37 @@ int createNopollConnection(noPollCtx *ctx, server_list_t *server_list)
 	
 	max_retry_count = (int) get_parodus_cfg()->webpa_backoff_max;
 	ParodusPrint("max_retry_count is %d\n", max_retry_count );
-
-	memset (&conn_ctx, 0, sizeof(create_connection_ctx_t));
+  
 	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_extra_headers (&conn_ctx, false);
+        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);
-#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->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);

-	// Invoke the ping status change event callback as "received" ping
-	if(NULL != on_ping_status_change)
-	{
-		on_ping_status_change("received");
-	}
-
 	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);
@@ -789,7 +590,8 @@ int createNopollConnection(noPollCtx *ctx, server_list_t *server_list)
 	}

 	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");
@@ -799,7 +601,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 ();
+
 	return nopoll_true;
 }          

@@ -826,20 +628,13 @@ static char* build_extra_headers( const char *auth, const char *device_id,
 static noPollConnOpts * createConnOpts (char * extra_headers, bool secure)
 {
    noPollConnOpts * opts;
-    char * mtls_client_cert_path = NULL;
-    char * mtls_client_key_path = NULL;
    
    opts = nopoll_conn_opts_new ();
    if(secure) 
 	{
 	    if(strlen(get_parodus_cfg()->cert_path) > 0)
            {
-                if( ( get_parodus_cfg()->mtls_client_cert_path !=NULL && strlen(get_parodus_cfg()->mtls_client_cert_path) > 0) && (get_parodus_cfg()->mtls_client_key_path !=NULL && strlen(get_parodus_cfg()->mtls_client_key_path) > 0) )
-                {
-                       mtls_client_cert_path = get_parodus_cfg()->mtls_client_cert_path;
-                       mtls_client_key_path = get_parodus_cfg()->mtls_client_key_path;
-                }
-                nopoll_conn_opts_set_ssl_certs(opts, mtls_client_cert_path, mtls_client_key_path, NULL, get_parodus_cfg()->cert_path);
+                nopoll_conn_opts_set_ssl_certs(opts, NULL, NULL, NULL, get_parodus_cfg()->cert_path);
            }
 	    nopoll_conn_opts_ssl_peer_verify (opts, nopoll_true);
 	    nopoll_conn_opts_set_ssl_protocol (opts, NOPOLL_METHOD_TLSV1_2);
@@ -849,88 +644,14 @@ static noPollConnOpts * createConnOpts (char * extra_headers, bool secure)
 	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);
-      get_parodus_cfg()->cloud_status = CLOUD_STATUS_OFFLINE;
-      ParodusInfo("cloud_status set as %s after connection close\n", get_parodus_cfg()->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)
-{
-  int fd;
-  FILE *fp;
-  unsigned long timestamp;
-  ParodusCfg *cfg = get_parodus_cfg();
-
-  if (NULL == cfg->connection_health_file)
-    return;
-  fd = open (cfg->connection_health_file, O_CREAT | O_WRONLY | O_SYNC, 0666);
-  if (fd < 0) {
-    ParodusError ("Error(1) %d opening file %s\n", errno, cfg->connection_health_file);
-    return;
-  }
-  ftruncate (fd, 0);
-  fp = fdopen (fd, "w");
-  if (fp == NULL) {
-    ParodusError ("Error(2) %d opening file %s\n", errno, cfg->connection_health_file);
-    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);
-  
-  fclose (fp);
-}
-
-void start_conn_in_progress (unsigned long start_time)
-{
-  write_conn_in_prog_file (true, start_time);
-}   
-
-void stop_conn_in_progress (void)
-{
-  write_conn_in_prog_file (false, 0);
-}   
-
-
-void registerParodusOnPingStatusChangeHandler(parodusOnPingStatusChangeHandler callback_func)
-{
-	on_ping_status_change = callback_func;
-}
-
--- a/src/connection.h
+++ b/src/connection.h
@@ -33,37 +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"

-/**
-* 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);

@@ -72,21 +57,6 @@ void set_global_reconnect_status(bool status);

 int get_cloud_disconnect_time();
 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 stop_conn_in_progress (void);
-
-// 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
@@ -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
@@ -121,9 +121,6 @@ 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) ? "NA" : message->u.crud.transaction_uuid)));
-			OnboardLog("%s\n",
-                            ((WRP_MSG_TYPE__REQ   == msgType) ? message->u.req.transaction_uuid :
-                            ((WRP_MSG_TYPE__EVENT == msgType) ? "NA" : message->u.crud.transaction_uuid)));
                        
                        free(destVal);

--- 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,10 +22,8 @@
 */

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

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

 pthread_mutex_t heartBeat_mut=PTHREAD_MUTEX_INITIALIZER;

@@ -51,27 +49,8 @@ void reset_heartBeatTimer()
 void increment_heartBeatTimer(unsigned int inc_time_ms) 
 {
 	pthread_mutex_lock (&heartBeat_mut);
-	if (!paused)
-	  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;
+	heartBeatTimer += inc_time_ms;
 	pthread_mutex_unlock (&heartBeat_mut);
 }


-
--- a/src/heartBeat.h
+++ b/src/heartBeat.h
@@ -39,12 +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();
-
 #ifdef __cplusplus
 }
 #endif
--- a/src/main.c
+++ b/src/main.c
@@ -18,16 +18,13 @@
 #include <string.h>
 #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
 #include "breakpad_wrapper.h"
-#endif
+#else
 #include "signal.h"
-#include "privilege.h"
+#endif

 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */
@@ -37,80 +34,53 @@
 /*----------------------------------------------------------------------------*/
 /*                               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
-    /* breakpad handles the signals SIGSEGV, SIGBUS, SIGFPE, and SIGILL */
    breakpad_ExceptionHandler();
 #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();
    setDefaultValuesToCfg(cfg);
    if (0 != parseCommandLine(argc,argv,cfg)) {
 		abort();
 	}
-    curl_global_init(CURL_GLOBAL_DEFAULT);
+    getAuthToken(cfg);
     
    createSocketConnection( NULL);
    
@@ -125,6 +95,7 @@ const char *rdk_logger_module_fetch(void)
 /*----------------------------------------------------------------------------*/
 /*                             Internal functions                             */
 /*----------------------------------------------------------------------------*/
+#ifndef INCLUDE_BREAKPAD
 static void sig_handler(int sig)
 {

@@ -132,25 +103,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 */
@@ -169,7 +132,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
@@ -167,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,33 +49,49 @@ void setMessageHandlers()
    nopoll_conn_set_on_close(get_global_conn(), (noPollOnCloseHandler)listenerOnCloseMessage, NULL);
 }

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

 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;
-	}
+    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));
+        //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);
+			}
+
+		}
    }
 }

@@ -134,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/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
@@ -178,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/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
@@ -417,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
            {
@@ -620,7 +589,6 @@ void sendUpstreamMsgToServer(void **resp_bytes, size_t resp_size)
 		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);
 		}
 		free(appendData);
 		appendData =NULL;
--- 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
@@ -90,16 +88,16 @@ 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
@@ -122,10 +120,10 @@ target_link_libraries (test_nopoll_handlers_fragment -lnopoll -lcunit -lcimplog
 add_test(NAME test_connection COMMAND ${MEMORY_CHECK} ./test_connection)
 set (CONN_SRC ../src/connection.c 
  ../src/string_helpers.c ../src/mutex.c ../src/time.c 
-  ../src/config.c ../src/auth_token.c ../src/spin_thread.c  ../src/heartBeat.c ../src/close_retry.c)
+  ../src/config.c ../src/spin_thread.c  ../src/heartBeat.c ../src/close_retry.c)
 #set(CONN_SRC ../src/connection.c ${PARODUS_COMMON_SRC})
 add_executable(test_connection test_connection.c ${CONN_SRC})
-target_link_libraries (test_connection ${PARODUS_COMMON_LIBS} -lcmocka -lcurl -luuid)
+target_link_libraries (test_connection ${PARODUS_COMMON_LIBS} -lcmocka)

 #-------------------------------------------------------------------------------
 #   test_connection - function createNopollConnection
@@ -143,7 +141,7 @@ target_link_libraries (test_connection ${PARODUS_COMMON_LIBS} -lcmocka -lcurl -l
 add_test(NAME test_client_list COMMAND ${MEMORY_CHECK} ./test_client_list)
 #add_executable(test_client_list test_client_list.c ../src/client_list.c ../src/service_alive.c ../src/upstream.c ../src/networking.c ../src/nopoll_helpers.c ../src/downstream.c ../src/connection.c ../src/nopoll_handlers.c ../src/ParodusInternal.c ../src/thread_tasks.c ../src/conn_interface.c ../src/partners_check.c ${PARODUS_COMMON_SRC})
 #target_link_libraries (test_client_list ${PARODUS_COMMON_LIBS})
-set(CLIST_SRC test_client_list.c ../src/client_list.c ../src/auth_token.c
+set(CLIST_SRC test_client_list.c ../src/client_list.c 
 ../src/service_alive.c ../src/upstream.c ../src/networking.c ../src/nopoll_helpers.c 
 ../src/downstream.c ../src/connection.c ../src/nopoll_handlers.c ../src/heartBeat.c ../src/close_retry.c
 ../src/ParodusInternal.c ../src/thread_tasks.c ../src/conn_interface.c 
@@ -157,7 +155,7 @@ endif (ENABLE_SESHAT)
 
 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)
+target_link_libraries (test_client_list ${PARODUS_COMMON_LIBS})

 #-------------------------------------------------------------------------------
 #   test_service_alive
@@ -165,7 +163,7 @@ target_link_libraries (test_client_list ${PARODUS_COMMON_LIBS} -lcurl -luuid)
 add_test(NAME test_service_alive COMMAND ${MEMORY_CHECK} ./test_service_alive)
 #add_executable(test_service_alive test_service_alive.c ../src/client_list.c ../src/service_alive.c ../src/upstream.c ../src/networking.c ../src/nopoll_helpers.c ../src/nopoll_handlers.c ../src/config.c ../src/connection.c ../src/ParodusInternal.c ../src/downstream.c ../src/thread_tasks.c ../src/conn_interface.c ../src/partners_check.c ${PARODUS_COMMON_SRC})
 #target_link_libraries (test_service_alive ${PARODUS_COMMON_LIBS})
-set(SVA_SRC test_service_alive.c ../src/client_list.c ../src/service_alive.c ../src/auth_token.c ../src/upstream.c ../src/networking.c ../src/nopoll_helpers.c ../src/nopoll_handlers.c ../src/config.c ../src/connection.c ../src/ParodusInternal.c ../src/downstream.c ../src/thread_tasks.c ../src/conn_interface.c ../src/partners_check.c ../src/heartBeat.c ../src/close_retry.c ${PARODUS_COMMON_SRC})
+set(SVA_SRC test_service_alive.c ../src/client_list.c ../src/service_alive.c ../src/upstream.c ../src/networking.c ../src/nopoll_helpers.c ../src/nopoll_handlers.c ../src/config.c ../src/connection.c ../src/ParodusInternal.c ../src/downstream.c ../src/thread_tasks.c ../src/conn_interface.c ../src/partners_check.c ../src/heartBeat.c ../src/close_retry.c ${PARODUS_COMMON_SRC})
 if (ENABLE_SESHAT)
 set(SVA_SRC ${SVA_SRC} ../src/seshat_interface.c)
 else()
@@ -174,36 +172,16 @@ endif (ENABLE_SESHAT)

 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)
+target_link_libraries (test_service_alive ${PARODUS_COMMON_LIBS})

 #-------------------------------------------------------------------------------
 #   test_config
 #-------------------------------------------------------------------------------
 add_test(NAME test_config COMMAND ${MEMORY_CHECK} ./test_config)
-add_executable(test_config test_config.c ../src/config.c ../src/auth_token.c ../src/string_helpers.c)
+add_executable(test_config test_config.c ../src/config.c ../src/string_helpers.c)
 target_link_libraries (test_config -lcmocka
 -Wl,--no-as-needed -lcimplog
- -lcjson -lcjwt -ltrower-base64 -lssl -lcrypto -lrt -lm -lcurl -luuid
-)
-
-#-------------------------------------------------------------------------------
-#   test_auth_token
-#-------------------------------------------------------------------------------
-add_test(NAME test_auth_token COMMAND ${MEMORY_CHECK} ./test_auth_token)
-add_executable(test_auth_token test_auth_token.c ../src/config.c ../src/auth_token.c ../src/string_helpers.c)
-target_link_libraries (test_auth_token -lcmocka
- -Wl,--no-as-needed -lcimplog
- -lcjson -lcjwt -ltrower-base64 -lssl -lcrypto -lrt -lm -lcurl -luuid
-)
-
-#-------------------------------------------------------------------------------
-#   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)
-target_link_libraries (test_auth_token_more -lcmocka
- -Wl,--no-as-needed -lcimplog
- -lcjson -lcjwt -ltrower-base64 -lssl -lcrypto -lrt -lm -lcurl -luuid
+ -lcjson -lcjwt -ltrower-base64 -lssl -lcrypto -lrt -lm
 )

 #-------------------------------------------------------------------------------
@@ -224,9 +202,8 @@ 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)
-target_link_libraries (test_crud_internal -lcmocka ${PARODUS_COMMON_LIBS} -lcurl -luuid)
+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} )

 #-------------------------------------------------------------------------------
 #   test_upstream
@@ -236,17 +213,6 @@ 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)
-
-#-------------------------------------------------------------------------------
-#   test_upstream_sock
-#-------------------------------------------------------------------------------
-add_test(NAME test_upstream_sock COMMAND ${MEMORY_CHECK} ./test_upstream_sock)
-add_executable(test_upstream_sock test_upstream_sock.c ../src/upstream.c 
-  ../src/client_list.c ../src/close_retry.c ../src/string_helpers.c)
-target_link_libraries (test_upstream_sock -lcmocka gcov -lcunit -lcimplog
- -lwrp-c -luuid -lpthread -lmsgpackc -lnopoll -lnanomsg
- -Wl,--no-as-needed -lcjson -lcjwt -ltrower-base64
 -lssl -lcrypto -lrt -lm)

 #-------------------------------------------------------------------------------
@@ -286,8 +252,6 @@ set(CONIFC_SRC test_conn_interface.c
  ../src/mutex.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)
@@ -295,14 +259,14 @@ else()
 set(CONIFC_SRC ${CONIFC_SRC} ../src/seshat_interface_stub.c)
 endif (ENABLE_SESHAT)
 add_executable(test_conn_interface ${CONIFC_SRC})
-target_link_libraries (test_conn_interface -lcmocka ${PARODUS_COMMON_LIBS} -lcurl -luuid )
+target_link_libraries (test_conn_interface -lcmocka ${PARODUS_COMMON_LIBS} )

 #-------------------------------------------------------------------------------
 #   test_ParodusInternal
 #-------------------------------------------------------------------------------
 add_test(NAME test_ParodusInternal COMMAND ${MEMORY_CHECK} ./test_ParodusInternal)
 add_executable(test_ParodusInternal test_ParodusInternal.c ../src/ParodusInternal.c ../src/config.c ../src/string_helpers.c)
-target_link_libraries (test_ParodusInternal -lcmocka ${PARODUS_COMMON_LIBS} -lcurl -luuid)
+target_link_libraries (test_ParodusInternal -lcmocka ${PARODUS_COMMON_LIBS} )

 #-------------------------------------------------------------------------------
 #   test_partners_check
@@ -321,11 +285,11 @@ set(TOKEN_SRC ../src/conn_interface.c ../src/config.c
 ../src/nopoll_handlers.c ../src/nopoll_helpers.c
 ../src/partners_check.c ../src/ParodusInternal.c
 ../src/upstream.c ../src/downstream.c 
- ../src/networking.c ../src/auth_token.c
+ ../src/networking.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)
@@ -342,7 +306,7 @@ endif (FEATURE_DNS_QUERY)

 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)
+target_link_libraries (test_token ${PARODUS_COMMON_LIBS} -lcmocka )

 #-------------------------------------------------------------------------------
 #   test_seshat_interface - registerWithSeshat
--- 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/test_auth_token.c
+++ b/tests/test_auth_token.c
@@ -1,435 +0,0 @@
-/**
- *  Copyright 2010-2016 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.
- */
-#include <assert.h>
-#include <errno.h>
-#include <pthread.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
-
-#include <CUnit/Basic.h>
-
-#include "../src/config.h"
-#include "../src/auth_token.h"
-#include "../src/ParodusInternal.h"
-
-extern int requestNewAuthToken(char *newToken, size_t len, int r_count);
-
-/*----------------------------------------------------------------------------*/
-/*                                   Mocks                                    */
-/*----------------------------------------------------------------------------*/
-typedef void CURL;
-
-typedef enum {
-  CURLINFO_RESPONSE_CODE    = 2,
-  CURLINFO_TOTAL_TIME
-} CURLINFO;
-
-struct token_data test_data;
-
-int curl_easy_perform(CURL *curl)
-{
-	UNUSED(curl);
-	char *msg = "response";
-	int rtn;
-
-	function_called();
-	rtn = (int) mock();
-	if (0 == rtn)
-	  write_callback_fn (msg, 1, strlen(msg), &test_data);
-	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);
-	}
-	function_called();
-	return (int) mock();
-}
-
-char* get_global_reconnect_reason()
-{
-    return "none";
-}
-
-/*----------------------------------------------------------------------------*/
-/*                                   Tests                                    */
-/*----------------------------------------------------------------------------*/
-void getAuthToken_Null()
-{
-	ParodusCfg cfg;
-	memset(&cfg,0,sizeof(cfg));
-	parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
-	cfg.client_cert_path = NULL;
-	getAuthToken(&cfg);
-	set_parodus_cfg(&cfg);
-	assert( cfg.client_cert_path == NULL);
-	assert_int_equal (0, (int) cfg.webpa_auth_token[0]);
-}
-
-void getAuthToken_MacNull()
-{
-    ParodusCfg cfg;
-    memset(&cfg,0,sizeof(cfg));
-    cfg.client_cert_path = NULL;
-    getAuthToken(&cfg);
-    set_parodus_cfg(&cfg);
-    assert( cfg.client_cert_path == NULL);
-    assert_int_equal (0, (int) cfg.webpa_auth_token[0]);
-}
-
-#if 0
-void test_requestNewAuthToken_init_fail ()
-{
-	char token[32];
-	ParodusCfg cfg;
-	int output = -1;
-	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.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, -1);
-	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, -1);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	requestNewAuthToken (token, sizeof(token), 2);
-	assert_int_equal (output, -1);
-	free(cfg.token_server_url);
-}
-#endif
-
-void test_requestNewAuthToken_failure ()
-{
-	char token[32];
-	ParodusCfg cfg;
-	int output = -1;
-	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.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;
-	will_return (curl_easy_perform, -1);
-	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, -1);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	requestNewAuthToken (token, sizeof(token), 2);
-	assert_int_equal (output, -1);
-	assert_int_equal (0, (int) token[0]);
-	free(cfg.token_server_url);
-}
-
-
-void test_requestNewAuthToken ()
-{
-  char token[1024];
-  ParodusCfg cfg;
-  int output = -1;
-  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(200);
-  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, 0);
-  assert_string_equal (token, "response");
-  free(cfg.token_server_url);
-}
-
-void test_getAuthToken ()
-{
-	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);
-
-	/* To test curl failure case and retry on v4 mode */
-	will_return (curl_easy_perform, -1);
-	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);
-
-	/* To test curl failure case and retry on v6 mode */
-	will_return (curl_easy_perform, -1);
-	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);
-
-	/* 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);
-
-	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);
-
-	getAuthToken(&cfg);
-	assert_string_equal (cfg.webpa_auth_token, "response");
-	free(cfg.client_cert_path);
-	free(cfg.token_server_url);
-}
-
-void test_getAuthTokenFailure ()
-{
-	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, -1);
-	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, -1);
-	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, -1);
-	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);
-
-	getAuthToken(&cfg);
-
-	assert_string_equal( cfg.webpa_auth_token, "");
-
-	free(cfg.client_cert_path);
-	free(cfg.token_server_url);
-}
-
-void test_write_callback_fn ()
-{
-	ParodusCfg *cfg;
-	size_t max_data_size = sizeof (cfg->webpa_auth_token);
-	char *buffer1 = "response1";
-	size_t buf1len = strlen(buffer1);
-        char *buffer2 = "R2";
-	size_t buf2len = strlen(buffer2);
-	char buffer3[max_data_size];
-	int out_len=0;
-	struct token_data data;
-	data.size = 0;
-
-	data.data = (char *) malloc(max_data_size);
-	data.data[0] = '\0';
-
-	out_len = write_callback_fn(buffer1, 1, buf1len, &data);
-	assert_string_equal(data.data, buffer1);
-	assert_int_equal (out_len, buf1len);
-	assert_int_equal (data.size, buf1len);
-
-	out_len = write_callback_fn(buffer2, 1, buf2len, &data);
-	assert_string_equal(data.data, "response1R2");
-	assert_int_equal (out_len, buf2len);
-	assert_int_equal (data.size, buf1len+buf2len);
-
-	memset (buffer3, 'x', max_data_size);
-	out_len = write_callback_fn(buffer3, 1, max_data_size, &data);
-	assert_int_equal (out_len, 0);
-	assert_int_equal (data.size, 0);
-
-	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                             */
-/*----------------------------------------------------------------------------*/
-
-int main(void)
-{
-    const struct CMUnitTest tests[] = {
-	cmocka_unit_test(test_write_callback_fn),
-        cmocka_unit_test(test_requestNewAuthToken),
-	// cmocka_unit_test(test_requestNewAuthToken_init_fail),
-	cmocka_unit_test(test_requestNewAuthToken_failure),
-	cmocka_unit_test(getAuthToken_Null),
-	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
@@ -1,116 +0,0 @@
-/**
- *  Copyright 2010-2016 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.
- */
-#include <assert.h>
-#include <errno.h>
-#include <pthread.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
-
-#include <CUnit/Basic.h>
-
-#include "../src/config.h"
-#include "../src/auth_token.h"
-#include "../src/ParodusInternal.h"
-
-extern int requestNewAuthToken(char *newToken, size_t len, int r_count);
-
-/*----------------------------------------------------------------------------*/
-/*                                   Mocks                                    */
-/*----------------------------------------------------------------------------*/
-typedef void CURL;
-
-typedef enum {
-  CURLINFO_RESPONSE_CODE    = 2,
-  CURLINFO_TOTAL_TIME
-} CURLINFO;
-
-struct token_data test_data;
-
-CURL *curl_easy_init  ()
-{
-	function_called();
-	return (CURL *) mock();
-}
-
-int curl_easy_perform(CURL *curl)
-{
-	UNUSED(curl);
-	char *msg = "response";
-	int rtn;
-
-	function_called();
-	rtn = (int) mock();
-	if (0 == rtn)
-	  write_callback_fn (msg, 1, strlen(msg), &test_data);
-	return rtn;
-}
-
-int curl_easy_getinfo(CURL *curl, CURLINFO CURLINFO_RESPONSE_CODE, long response_code)
-{
-	UNUSED(curl);
-	UNUSED(CURLINFO_RESPONSE_CODE);
-	UNUSED(response_code);
-	function_called();
-	return (int) mock();
-}
-
-char* get_global_reconnect_reason()
-{
-    return "none";
-}
-
-
-/*----------------------------------------------------------------------------*/
-/*                                   Tests                                    */
-/*----------------------------------------------------------------------------*/
-void test_requestNewAuthToken_init_fail ()
-{
-	char token[32];
-	ParodusCfg cfg;
-	int output = -1;
-	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.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_init, NULL);
-	expect_function_calls (curl_easy_init, 1);
-
-	requestNewAuthToken (token, sizeof(token), 2);
-	assert_int_equal (output, -1);
-	assert_int_equal (0, (int) token[0]);
-	free(cfg.token_server_url);
-}
-
-/*----------------------------------------------------------------------------*/
-/*                             External Functions                             */
-/*----------------------------------------------------------------------------*/
-
-int main(void)
-{
-    const struct CMUnitTest tests[] = {
-	cmocka_unit_test(test_requestNewAuthToken_init_fail)
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
--- 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
@@ -25,7 +25,6 @@
 #include <CUnit/Basic.h>

 #include "../src/config.h"
-#include "../src/auth_token.h"
 #include "../src/ParodusInternal.h"

 extern int parse_mac_address (char *target, const char *arg);
@@ -38,6 +37,8 @@ extern int parse_webpa_url (const char *full_url,
 	char **server_addr, unsigned int *port);
 extern unsigned int get_algo_mask (const char *algo_str);
 extern unsigned int parse_num_arg (const char *arg, const char *arg_name);
+extern void execute_token_script(char *token, char *name, size_t len, char *mac, char *serNum);
+extern void createNewAuthToken(char *newToken, size_t len);

 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
@@ -52,12 +53,6 @@ void create_token_script(char *fname)
    sprintf(command, "chmod +x %s",fname);
    system(command);
 }
-
-char* get_global_reconnect_reason()
-{
-    return "none";
-}
-
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/
@@ -121,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()
@@ -191,10 +184,9 @@ void test_parseCommandLine()
 #endif
 		"--force-ipv4",
 		"--force-ipv6",
-		"--boot-time-retry-wait=10",
+		"--token-read-script=/tmp/token.sh",
+		"--token-acquisition-script=/tmp/token.sh",
 		"--ssl-cert-path=/etc/ssl/certs/ca-certificates.crt",
-		"--client-cert-path=testcert",
-		"--token-server-url=https://dev.comcast.net/token",
 #ifdef FEATURE_DNS_QUERY
 		"--acquire-jwt=1",
 		"--dns-txt-url=mydns.mycom.net",
@@ -222,7 +214,6 @@ void test_parseCommandLine()
    assert_string_equal( parodusCfg.hw_last_reboot_reason, "unknown");	
    assert_string_equal( parodusCfg.fw_name, "TG1682_DEV_master_2016000000sdy");	
    assert_int_equal( (int) parodusCfg.webpa_ping_timeout,180);	
-    assert_int_equal( (int) parodusCfg.boot_retry_wait,10);
    assert_string_equal( parodusCfg.webpa_interface_used, "br0");	
    assert_string_equal( parodusCfg.webpa_url, "http://127.0.0.1");
    assert_int_equal( (int) parodusCfg.webpa_backoff_max,0);
@@ -233,20 +224,18 @@ void test_parseCommandLine()
    assert_string_equal(  parodusCfg.seshat_url, "ipc://127.0.0.1:7777");
 #endif
    assert_int_equal( (int) parodusCfg.flags, FLAGS_IPV6_ONLY|FLAGS_IPV4_ONLY);
-    
-    set_parodus_cfg(&parodusCfg);
+    sprintf(expectedToken,"secure-token-%s-%s",parodusCfg.hw_serial_number,parodusCfg.hw_mac);
    getAuthToken(&parodusCfg);
+    set_parodus_cfg(&parodusCfg);
+    
    assert_string_equal(  get_parodus_cfg()->webpa_auth_token,expectedToken);
    assert_string_equal(  parodusCfg.cert_path,"/etc/ssl/certs/ca-certificates.crt");
-	assert_string_equal(  parodusCfg.client_cert_path,"testcert");
-	assert_string_equal(  parodusCfg.token_server_url,"https://dev.comcast.net/token");
 #ifdef FEATURE_DNS_QUERY
 	assert_int_equal( (int) parodusCfg.acquire_jwt, 1);
    assert_string_equal(parodusCfg.dns_txt_url, "mydns.mycom.net");
    assert_int_equal( (int) parodusCfg.jwt_algo, 1024);
 	assert_string_equal ( get_parodus_cfg()->jwt_key, jwt_key);
 #endif
-	assert_int_equal( (int) parodusCfg.boot_retry_wait, 10);
 	assert_string_equal(parodusCfg.crud_config_file, "parodus_cfg.json");
 }

@@ -306,9 +295,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));
@@ -329,13 +317,13 @@ void test_loadParodusCfg()
    Cfg->jwt_algo = 1025;
    parStrncpy(Cfg->jwt_key, "AGdyuwyhwl2ow2ydsoioiygkshwdthuwd",sizeof(Cfg->jwt_key));
 #endif
+    parStrncpy(Cfg->token_acquisition_script , "/tmp/token.sh", sizeof(Cfg->token_acquisition_script));
+    parStrncpy(Cfg->token_read_script , "/tmp/token.sh", sizeof(Cfg->token_read_script));
    parStrncpy(Cfg->cert_path, "/etc/ssl.crt",sizeof(Cfg->cert_path));
 #ifdef ENABLE_SESHAT
    parStrncpy(Cfg->seshat_url, "ipc://tmp/seshat_service.url", sizeof(Cfg->seshat_url));
 #endif
 	Cfg->crud_config_file = strdup("parodus_cfg.json");
-	Cfg->client_cert_path = strdup("testcert");
-	Cfg->token_server_url = strdup("https://dev.comcast.net/token");
    memset(&tmpcfg,0,sizeof(ParodusCfg));
    loadParodusCfg(Cfg,&tmpcfg);

@@ -346,27 +334,19 @@ void test_loadParodusCfg()
    assert_string_equal( tmpcfg.local_url, "tcp://10.0.0.1:6000");
    assert_string_equal( tmpcfg.partner_id, "shaw");
    assert_string_equal( tmpcfg.webpa_protocol, protocol);
-	assert_string_equal(tmpcfg.client_cert_path, "testcert");
-	assert_string_equal(tmpcfg.token_server_url, "https://dev.comcast.net/token");
 #ifdef FEATURE_DNS_QUERY
 	assert_int_equal( (int) tmpcfg.acquire_jwt, 1);
    assert_string_equal(tmpcfg.dns_txt_url, "mydns");
    assert_int_equal( (int) tmpcfg.jwt_algo, 1025);
    assert_string_equal(tmpcfg.jwt_key, "AGdyuwyhwl2ow2ydsoioiygkshwdthuwd");
 #endif
+    assert_string_equal(  tmpcfg.token_acquisition_script,"/tmp/token.sh");
+    assert_string_equal(  tmpcfg.token_read_script,"/tmp/token.sh");
    assert_string_equal(tmpcfg.cert_path, "/etc/ssl.crt");
 #ifdef ENABLE_SESHAT
    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);
 }

@@ -438,8 +418,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()
@@ -575,6 +553,47 @@ void test_get_algo_mask ()
 #endif	
 }

+void test_execute_token_script()
+{
+  char *cmd1 = "../../tests/return_ser_mac.bsh";
+  char *cmd2 = "nosuch";
+  char token[32];
+  
+  memset (token, '\0', sizeof(token));
+  execute_token_script (token, cmd1, sizeof(token), "mac123", "ser456");
+  assert_string_equal (token, "SER_MAC ser456 mac123");
+  
+  memset (token, '\0', sizeof(token));
+  execute_token_script (token, cmd2, sizeof(token), "mac123", "ser456");
+  assert_string_equal (token, "");
+}
+
+void test_new_auth_token ()
+{
+  char token[64];
+  ParodusCfg cfg;
+  memset(&cfg,0,sizeof(cfg));
+
+  parStrncpy (cfg.token_acquisition_script, "../../tests/return_success.bsh",
+	sizeof(cfg.token_acquisition_script));
+  parStrncpy (cfg.token_read_script, "../../tests/return_ser_mac.bsh",
+	sizeof(cfg.token_read_script));
+  parStrncpy(cfg.hw_serial_number, "Fer23u948590", sizeof(cfg.hw_serial_number));
+  parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
+	
+  set_parodus_cfg(&cfg);
+  createNewAuthToken (token, sizeof(token));
+  assert_string_equal (token, "SER_MAC Fer23u948590 123567892366");
+  
+  memset (token, 0, sizeof(token));
+  parStrncpy (cfg.token_acquisition_script, "../../tests/return_failure.bsh",
+	sizeof(cfg.token_acquisition_script));
+  set_parodus_cfg(&cfg);
+  createNewAuthToken (token, sizeof(token));
+  assert_string_equal (token, "");  
+	
+}
+
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
@@ -599,6 +618,8 @@ int main(void)
        //cmocka_unit_test(test_parodusGitVersion),
        cmocka_unit_test(test_setDefaultValuesToCfg),
        cmocka_unit_test(err_setDefaultValuesToCfg),
+        cmocka_unit_test(test_execute_token_script),
+        cmocka_unit_test(test_new_auth_token)
    };

    return cmocka_run_group_tests(tests, NULL, NULL);
--- 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();
 }
@@ -87,53 +74,6 @@ noPollMutexUnlock 	mutex_unlock
    UNUSED(mutex_create); UNUSED(mutex_destroy); UNUSED(mutex_lock); UNUSED(mutex_unlock);
    function_called();
 }
-
-char *get_global_reconnect_reason()
-{
-    return reconnect_reason;
-}
-
-char *get_global_shutdown_reason()
-{
-    return SHUTDOWN_REASON_PARODUS_STOP;
-}
-
-void set_global_shutdown_reason(char *reason)
-{
-    UNUSED(reason);
-}
-
-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();
@@ -191,19 +131,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();
@@ -292,6 +225,9 @@ void timespec_diff(struct timespec *start, struct timespec *stop,
   diff->tv_nsec = 1000;
 }

+void deleteAllClients (void)
+{
+}

 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
@@ -364,6 +300,7 @@ 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);
    
 }

--- 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); 
@@ -158,8 +117,6 @@ nopoll_bool  nopoll_conn_wait_for_status_until_connection_ready (noPollConn * co
 	int timeout, int *status, char ** message)
 {
    UNUSED(conn); UNUSED(timeout);
-
-    *message = NULL;
    if (mock_wait_status >= 1000) {
      *status = mock_wait_status / 1000;
      mock_wait_status = mock_wait_status % 1000;
@@ -189,9 +146,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 +198,6 @@ int allow_insecure_conn (char **server_addr, unsigned int *port)
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/

-
 void test_get_global_conn()
 {
    assert_null(get_global_conn());
@@ -266,7 +224,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 +301,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,28 +363,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);
-}
-
-void init_cfg_header_info (ParodusCfg *cfg)
-{
-  parStrncpy(cfg->hw_mac , "123567892366", sizeof(cfg->hw_mac));
-  parStrncpy(cfg->hw_model, "TG1682", sizeof(cfg->hw_model));
-  parStrncpy(cfg->hw_manufacturer , "ARRISGroup,Inc.", sizeof(cfg->hw_manufacturer));
-  parStrncpy(cfg->fw_name , "2.364s2", sizeof(cfg->fw_name));
-  parStrncpy(cfg->webpa_protocol , "WebPA-1.6", sizeof(cfg->webpa_protocol));
+  assert_ptr_equal (&ctx.server_list.defaults, ctx.current_server);
 }

 void test_set_extra_headers ()
@@ -489,6 +381,7 @@ void test_set_extra_headers ()
  create_connection_ctx_t ctx;
  ParodusCfg cfg;
  const char *expected_extra_headers =
+      "\r\nAuthorization: Bearer SER_MAC Fer23u948590 123567892366"
      "\r\nX-WebPA-Device-Name: mac:123567892366"
      "\r\nX-WebPA-Device-Protocols: wrp-0.11,getset-0.1"
      "\r\nUser-Agent: WebPA-1.6 (2.364s2; TG1682/ARRISGroup,Inc.;)"
@@ -497,10 +390,16 @@ void test_set_extra_headers ()
  memset(&cfg,0,sizeof(cfg));
  memset (&ctx, 0, sizeof(ctx));

-  cfg.client_cert_path = strdup("testcert");
+  parStrncpy (cfg.token_acquisition_script, "../../tests/return_success.bsh",
+	sizeof(cfg.token_acquisition_script));    
+  parStrncpy (cfg.token_read_script, "../../tests/return_ser_mac.bsh",
+	sizeof(cfg.token_read_script));
  parStrncpy(cfg.hw_serial_number, "Fer23u948590", sizeof(cfg.hw_serial_number));
-  init_cfg_header_info (&cfg);
-  parStrncpy(cfg.cert_path , "/etc/ssl/certs/ca-certificates.crt", sizeof(cfg.cert_path));
+  parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
+  parStrncpy(cfg.hw_model, "TG1682", sizeof(cfg.hw_model));
+  parStrncpy(cfg.hw_manufacturer , "ARRISGroup,Inc.", sizeof(cfg.hw_manufacturer));
+  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 = init_header_info (&ctx.header_info);
@@ -511,9 +410,9 @@ void test_set_extra_headers ()
  assert_string_equal (ctx.header_info.conveyHeader, "WebPA-1.6 (TG1682)");
  set_extra_headers (&ctx, true);
  
+  assert_string_equal (get_parodus_cfg()->webpa_auth_token, 
+    "SER_MAC Fer23u948590 123567892366");
  assert_string_equal (ctx.extra_headers, expected_extra_headers);
-  if(cfg.client_cert_path !=NULL) {
-  free(cfg.client_cert_path); }
  free (ctx.extra_headers);
  free_header_info (&ctx.header_info);
 	
@@ -682,17 +581,22 @@ void test_nopoll_connect ()

 // Return codes for wait_connection_ready
 #define WAIT_SUCCESS	0
-#define WAIT_ACTION_RETRY	1	// if wait_status is 307, 302, 303, or 403
+#define WAIT_ACTION_RETRY	1	// if wait_status is 307, 302, 303 or 403
 #define WAIT_FAIL 	2

 void test_wait_connection_ready ()
 {
-  server_list_t server_list;
  create_connection_ctx_t ctx;
+  ParodusCfg Cfg;
+  const char *expected_extra_headers =
+      "\r\nAuthorization: Bearer Auth---"
+      "\r\nX-WebPA-Device-Name: mac:123567892366"
+      "\r\nX-WebPA-Device-Protocols: wrp-0.11,getset-0.1"
+      "\r\nUser-Agent: WebPA-1.6 (2.364s2; TG1682/ARRISGroup,Inc.;)"
+      "\r\nX-WebPA-Convey: WebPA-1.6 (TG1682)";

-  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;
@@ -704,7 +608,7 @@ 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_FAIL);
-
+  
  mock_wait_status = 503;
  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
@@ -721,40 +625,51 @@ 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;
+    memset(&Cfg, 0, sizeof(ParodusCfg));
+
+    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);
+  
+    init_header_info (&ctx.header_info);
    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.extra_headers, expected_extra_headers);
    free_extra_headers (&ctx);
    free_header_info (&ctx.header_info);
 }

 // 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_RETRY_DNS 	 2
+#define CONN_WAIT_ACTION_RETRY	1	// if wait_status is 307, 302, 303 or 403
+#define CONN_WAIT_RETRY_DNS 	2

 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 +686,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 +710,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 +721,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 +760,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 +772,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 +793,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,34 +805,40 @@ 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;
+  char *test_extra_headers =
+      "\r\nAuthorization: Bearer SER_MAC Fer23u948590 123567892366"
+      "\r\nX-WebPA-Device-Name: mac:123567892366"
+      "\r\nX-WebPA-Device-Protocols: wrp-0.11,getset-0.1"
+      "\r\nUser-Agent: WebPA-1.6 (2.364s2; TG1682/ARRISGroup,Inc.;)"
+      "\r\nX-WebPA-Convey: WebPA-1.6 (TG1682)";

  memset(&Cfg, 0, sizeof(ParodusCfg));
  parStrncpy (Cfg.webpa_url, "http://mydns.mycom.net:8080", sizeof(Cfg.webpa_url));
-  init_cfg_header_info (&Cfg);

  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;
+
+  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 +852,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 +864,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 +884,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 +916,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 +927,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 +942,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 +956,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 +967,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 +992,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 +1008,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 +1032,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 +1044,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 +1053,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 +1086,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_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)
 {
--- 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 ;
--- a/tests/test_nopoll_helpers.c
+++ b/tests/test_nopoll_helpers.c
@@ -16,14 +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"

 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */
@@ -33,9 +31,7 @@
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
- static noPollConn *conn = NULL;
- static ParodusCfg cfg;
- 
+ static noPollConn *conn;
 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/
@@ -57,12 +53,6 @@ nopoll_bool nopoll_conn_is_ready( noPollConn *conn )
    return (nopoll_bool)mock();
 }

-ParodusCfg *get_parodus_cfg(void)
-{
-	function_called();
-    return &cfg;
-}
-
 int  __nopoll_conn_send_common (noPollConn * conn, const char * content, long length, nopoll_bool  has_fin, long       sleep_in_header, noPollOpCode frame_type)
 {
    UNUSED(has_fin); UNUSED(sleep_in_header); UNUSED(frame_type); UNUSED(content);
@@ -126,11 +116,6 @@ int kill(pid_t pid, int sig)
    return (int) mock();
 }

-bool get_interface_down_event()
-{
-     return false;
-}
-
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/
@@ -221,8 +206,13 @@ void test_sendMessage()
 {
    int len = strlen("Hello Parodus!");
    
-    cfg.cloud_status = CLOUD_STATUS_ONLINE;
-    expect_function_calls (get_parodus_cfg, 1);
+    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);
@@ -232,23 +222,81 @@ void test_sendMessage()
    sendMessage(conn, "Hello Parodus!", len);
 }

-void test_sendMessageOffline()
+void connStuck_sendMessage()
 {
-    int len = strlen("Hello Parodus!");
-    
-    cfg.cloud_status = CLOUD_STATUS_OFFLINE;
-    expect_function_calls (get_parodus_cfg, 1);
+   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!");
    
-    cfg.cloud_status = CLOUD_STATUS_ONLINE;
-    expect_function_calls (get_parodus_cfg, 1);
-
+    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);
@@ -266,13 +314,11 @@ void err_sendMessageConnNull()
 {
    int len = strlen("Hello Parodus!");
    
-    cfg.cloud_status = CLOUD_STATUS_ONLINE;
-    expect_function_calls (get_parodus_cfg, 1);
+    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);
 }
@@ -297,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_sock.c
+++ b/tests/test_upstream_sock.c
@@ -1,249 +0,0 @@
-/**
- *  Copyright 2010-2016 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.
- */
-#include <assert.h>
-#include <errno.h>
-#include <pthread.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
-
-#include <nopoll.h>
-#include <wrp-c.h>
-#include <nanomsg/nn.h>
-
-#include "../src/upstream.h"
-#include "../src/config.h"
-#include "../src/client_list.h"
-#include "../src/ParodusInternal.h"
-#include "../src/partners_check.h"
-#include "../src/close_retry.h"
-
-/*----------------------------------------------------------------------------*/
-/*                            File Scoped Variables                           */
-/*----------------------------------------------------------------------------*/
-#define GOOD_CLIENT_URL "tcp://127.0.0.1:6667"
-
-static noPollConn *conn;
-static char *reconnect_reason = "webpa_process_starts";
-bool g_shutdown  = false;
-static ParodusCfg parodusCfg;
-extern size_t metaPackSize;
-extern UpStreamMsg *UpStreamMsgQ;
-int numLoops = 1;
-int deviceIDNull =0;
-wrp_msg_t *reg_msg = NULL;
-extern pthread_mutex_t nano_mut;
-extern pthread_cond_t nano_con;
-
-/*----------------------------------------------------------------------------*/
-/*                                   Mocks                                    */
-/*----------------------------------------------------------------------------*/
-reg_list_item_t *get_reg_list()
-{
-  reg_list_item_t *item = get_global_node();
-  release_global_node();
-  return item;
-}
-
-noPollConn *get_global_conn()
-{
-    return conn;   
-}
-
-char *get_global_reconnect_reason()
-{
-    return reconnect_reason;
-}
-
-void addCRUDmsgToQueue(wrp_msg_t *crudMsg)
-{
-	(void)crudMsg;
-	function_called();
-	return;
-}
-
-void sendMessage(noPollConn *conn, void *msg, size_t len)
-{
-    (void) conn; (void) msg; (void) len;
-    function_called();
-}
-
-void set_parodus_cfg(ParodusCfg *cfg)
-{
-    memcpy(&parodusCfg, cfg, sizeof(ParodusCfg));
-}
-
-ParodusCfg *get_parodus_cfg(void) 
-{
-	ParodusCfg cfg;
-	memset(&cfg,0,sizeof(cfg));
-	parStrncpy(cfg.hw_mac , "14cfe2142xxx", sizeof(cfg.hw_mac));
-	if(deviceIDNull)
-	{
-		parStrncpy(cfg.hw_mac , "", sizeof(cfg.hw_mac));
-	}
-	set_parodus_cfg(&cfg);
-    return &parodusCfg;
-}
-
-/*-------------------------------------------
-int nn_connect (int s, const char *addr)
-{
-    (void) s; (void) addr;
-    printf ("nn_connect, socket %d\n", s);
-    return 1;
-}
---------------------------------------------*/
-
-ssize_t wrp_pack_metadata( const data_t *packData, void **data )
-{
-    (void) packData; (void) data;
-    function_called();
-    
-    return (ssize_t)mock();
-}
-
-size_t appendEncodedData( void **appendData, void *encodedBuffer, size_t encodedSize, void *metadataPack, size_t metadataSize )
-{
-    (void) encodedBuffer; (void) encodedSize; (void) metadataPack; (void) metadataSize;
-    function_called();
-    char *data = (char *) malloc (sizeof(char) * 100);
-    parStrncpy(data, "AAAAAAAAYYYYIGkYTUYFJH", 100);
-    *appendData = data;
-    return (size_t)mock();
-}
-
-int nn_send (int s, const void *buf, size_t len, int flags)
-{
-    UNUSED(s); UNUSED(buf); UNUSED(len); UNUSED(flags);
-    function_called();
-    return (int)mock();
-}
-
-int pthread_cond_wait(pthread_cond_t *restrict cond, pthread_mutex_t *restrict mutex)
-{
-    UNUSED(cond); UNUSED(mutex);
-    function_called();
-    return (int)mock();
-}
-
-ssize_t wrp_to_struct( const void *bytes, const size_t length, const enum wrp_format fmt, wrp_msg_t **msg )
-{
-    UNUSED(bytes); UNUSED(length); UNUSED(fmt);
-    function_called();
-    *msg = reg_msg;
-    return (ssize_t)mock();
-}
-
-void wrp_free_struct( wrp_msg_t *msg )
-{
-    UNUSED(msg);
-    function_called();
-}
-
-int nn_freemsg (void *msg)
-{
-    UNUSED(msg);
-    function_called();
-    return (int)mock();
-}
-
-int validate_partner_id(wrp_msg_t *msg, partners_t **partnerIds)
-{
-    UNUSED(msg); UNUSED(partnerIds);
-    function_called();
-    return (int) mock();
-}
-
-/*----------------------------------------------------------------------------*/
-/*                                   Tests                                    */
-/*----------------------------------------------------------------------------*/
-
-
-void test_message()
-{
-    metaPackSize = 20;
-    UpStreamMsgQ = (UpStreamMsg *) malloc(sizeof(UpStreamMsg));
-    UpStreamMsgQ->msg = "First Message";
-    UpStreamMsgQ->len = 13;
-    UpStreamMsgQ->next = NULL;
-
-    numLoops = 1;
-    reg_msg = (wrp_msg_t *) malloc(sizeof(wrp_msg_t));
-    memset(reg_msg,0,sizeof(wrp_msg_t));
-    reg_msg->msg_type = WRP_MSG_TYPE__SVC_REGISTRATION;
-    reg_msg->u.reg.service_name = "config";
-    reg_msg->u.reg.url = GOOD_CLIENT_URL;
-
-    will_return(wrp_to_struct, 12);
-    expect_function_call(wrp_to_struct);
-
-    will_return(nn_send, 1);
-    expect_function_call(nn_send);
-
-    will_return(nn_freemsg, 0);
-    expect_function_call(nn_freemsg);
-    expect_function_call(wrp_free_struct);
-
-    processUpstreamMessage();
-    free(reg_msg);
-    free(UpStreamMsgQ);
-}
-
-void test_processUpstreamMessage()
-{
-  int last_sock = -1;
-  reg_list_item_t * reg_item = get_reg_list ();
-
-  assert_null (reg_item);
-  test_message();
-  reg_item = get_reg_list ();
-  assert_non_null (reg_item);
-  if (NULL == reg_item)
-    return;
-
-  last_sock = reg_item->sock;
-  test_message ();
-  assert_int_equal (get_numOfClients(), 1);
-  if (get_numOfClients() != 1)
-    return;
-  reg_item = get_reg_list ();
-  assert_int_equal (last_sock, reg_item->sock);
-  if (last_sock != reg_item->sock)
-    return;
-
-  test_message ();
-  assert_int_equal (get_numOfClients(), 1);
-  if (get_numOfClients() != 1)
-    return;
-  reg_item = get_reg_list ();
-  assert_int_equal (last_sock, reg_item->sock);
-
-}
-
-/*----------------------------------------------------------------------------*/
-/*                             External Functions                             */
-/*----------------------------------------------------------------------------*/
-
-int main(void)
-{
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test(test_processUpstreamMessage)
-    };
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
Author	SHA1	Message	Date
shilpa24balaji	117db39c64	Merge pull request #304 from bill1600/clrtoken3p4 clr auth token if fetch fails	2019-05-15 20:05:05 -07:00
Bill Williams	0ac7605a3b	clr auth token if fetch fails	2019-05-14 16:25:34 -07:00
Bill Williams	e03b795989	log all nn_close	2019-04-02 23:00:02 -07:00
Bill Williams	950954ee4d	close client when deleting from client list	2019-04-02 22:59:50 -07:00
Bill Williams	a2909de3ca	use endpoint in nn_shutdown and log nn_close errors	2019-04-02 22:59:29 -07:00
Bill Williams	1fd9cccaac	fix mutex error in service alive	2019-04-02 22:55:34 -07:00
Bill Williams	561113fe0a	fix test_upstream test	2019-04-02 22:55:22 -07:00
Bill Williams	1bc804f445	add nn_close to nn_shutdown	2019-04-02 22:55:10 -07:00