Fix Xmidt Headers

Update the CI pipeline.

.github/scripts/get_sonarcloud.sh

@@ -0,0 +1,24 @@
+#!/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

.github/workflows/codeql-analysis.yml

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

.github/workflows/push.yml

@@ -0,0 +1,71 @@
+# SPDX-FileCopyrightText: 2021 Comcast Cable Communications Management, LLC
+# SPDX-License-Identifier: Apache-2.0
+
+name: CI
+
+on:
+  pull_request:
+  push:
+    paths-ignore:
+      - 'AUTHORS'
+      - 'LICENSE'
+      - 'NOTICE'
+      - '**.md'
+      - '.gitignore'
+    tags-ignore:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+    branches:
+      - main
+
+jobs:
+  test:
+    name: Unit Tests
+    runs-on: [ ubuntu-latest ]
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      # Install the dependent packages
+      - name: Install packages
+        run: |
+          sudo apt update
+          sudo apt-get -y install valgrind libcunit1 libcunit1-doc libcunit1-dev libmsgpack-dev gcovr libtool
+          pip install codecov
+
+      - name: Make Build Directory
+        run: mkdir build
+
+      - name: Get Sonarcloud Binaries
+        working-directory: build
+        run: |
+          ../.github/scripts/get_sonarcloud.sh
+
+      - name: CMake
+        working-directory: build
+        run: |
+          cmake .. -DINTEGRATION_TESTING:BOOL=false -DDISABLE_VALGRIND:BOOL=${DISABLE_VALGRIND} -DENABLE_SESHAT:BOOL=true -DFEATURE_DNS_QUERY:BOOL=true
+
+
+      - name: Build
+        working-directory: build
+        run: |
+          build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-output make all test
+
+      - name: Merge GCOV Reports for Sonarcloud
+        working-directory: build
+        run: |
+          gcovr --sonarqube coverage.xml -r ..
+
+      - name: Upload SonarCloud
+        run: |
+          build/sonar-scanner/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io -Dproject.settings=.sonar-project.properties -Dsonar.login=${{ secrets.SONAR_TOKEN }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload Codecov.io
+        uses: codecov/codecov-action@v1
+        with:
+          directory: .
+          fail_ci_if_error: true

.github/workflows/release.yml

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

.github/workflows/tag.yml

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

.gitignore

@@ -34,3 +34,5 @@
 tags
 
 build/
+
+tests/jwt_key.tst

.sonar-project.properties

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

.travis.yml

@@ -1,43 +0,0 @@
-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="

.whitesource

@@ -0,0 +1,12 @@
+{
+  "scanSettings": {
+    "baseBranches": []
+  },
+  "checkRunSettings": {
+    "vulnerableCheckRunConclusionLevel": "failure",
+    "displayMode": "diff"
+  },
+  "issueSettings": {
+    "minSeverityLevel": "LOW"
+  }
+}

CHANGELOG.md

@@ -5,18 +5,20 @@ 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]
-- Security: Added support to use auth token during initial connect to cloud
-- Fix re-registration fails that lose a socket
-- Fix mutex error in service alive
-- Security: Mutual Authentication (mTLS or two way TLS)
-- Rename command line options for MTLS cert and Key
-- 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
-- Add pause/resume heartBeatTimer
-- parodus event handler to listen to interface_down and interface_up event
-- Pause connection retry during interface_down event
+
+## [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
@@ -24,12 +26,26 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - 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
-- 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.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
@@ -79,6 +95,7 @@ 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
@@ -88,7 +105,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Initial creation
 
-[Unreleased]: https://github.com/Comcast/parodus/compare/1.0.1...HEAD
+[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
 [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

CMakeLists.txt

@@ -14,6 +14,7 @@
 
 cmake_minimum_required(VERSION 2.8.7)
 
+#project(parodus VERSION 1.1.5)
 project(parodus)
 
 include(ExternalProject)

README.md

@@ -1,10 +1,16 @@
+<!--
+SPDX-FileCopyrightText: 2016-2021 Comcast Cable Communications Management, LLC
+SPDX-License-Identifier: Apache-2.0
+-->
 # parodus
 
-[![Build Status](https://travis-ci.org/xmidt-org/parodus.svg?branch=master)](https://travis-ci.org/xmidt-org/parodus)
-[![codecov.io](http://codecov.io/github/xmidt-org/parodus/coverage.svg?branch=master)](http://codecov.io/github/Comcast/parodus?branch=master)
+[![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)
 [![Coverity](https://img.shields.io/coverity/scan/11192.svg)](https://scan.coverity.com/projects/comcast-parodus)
-[![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)
+[![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)
 
 
 C implementation of the XMiDT client coordinator

src/CMakeLists.txt

@@ -15,7 +15,7 @@ set(SOURCES main.c mutex.c networking.c nopoll_helpers.c heartBeat.c nopoll_hand
     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)
+	crud_interface.c crud_tasks.c crud_internal.c close_retry.c auth_token.c privilege.c)
 
 if (ENABLE_SESHAT)
 set(SOURCES ${SOURCES} seshat_interface.c)

src/ParodusInternal.h

@@ -139,7 +139,6 @@ typedef struct {
 /*----------------------------------------------------------------------------*/
 extern bool g_shutdown;
 extern ParodusMsg *ParodusMsgQ;
-int numLoops;
 /*----------------------------------------------------------------------------*/
 /*                             Function Prototypes                            */
 /*----------------------------------------------------------------------------*/

src/auth_token.c

@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <fcntl.h> 
 #include "config.h"
+#include "connection.h"
 #include "auth_token.h"
 #include "ParodusInternal.h"
 #include <cjwt/cjwt.h>
@@ -31,13 +32,14 @@
 #include <curl/curl.h>
 #include <uuid/uuid.h>
 
-#define MAX_BUF_SIZE	        128
+#define MAX_BUF_SIZE	        256
 #define CURL_TIMEOUT_SEC	25L
 #define MAX_CURL_RETRY_COUNT 	3
+
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
-void createCurlheader(char *mac_header, char *serial_header, char *uuid_header, char *transaction_uuid, struct curl_slist *list, struct curl_slist **header_list);
+void createCurlheader(struct curl_slist *list, struct curl_slist **header_list);
 long g_response_code;
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
@@ -62,10 +64,6 @@ int requestNewAuthToken(char *newToken, size_t len, int r_count)
 	struct curl_slist *list = NULL;
 	struct curl_slist *headers_list = NULL;
 
-	char *mac_header = NULL;
-	char *serial_header = NULL;
-	char *uuid_header = NULL;
-	char *transaction_uuid = NULL;
 	double total;
 
 	struct token_data data;
@@ -77,7 +75,7 @@ int requestNewAuthToken(char *newToken, size_t len, int r_count)
 	{
 		data.data[0] = '\0';
 
-		createCurlheader(mac_header, serial_header, uuid_header, transaction_uuid, list, &headers_list);
+		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);
@@ -263,52 +261,60 @@ char* generate_trans_uuid()
 }
 
 /* @brief function to create curl header contains mac, serial number and uuid.
- * @param[in] mac_header mac address header key value pair
- * @param[in] serial_header serial number key value pair
- * @param[in] uuid_header transaction uuid key value pair
+ * @param[in] h the auth headers to populate
  * @param[in] list temp curl header list
  * @param[out] header_list output curl header list
 */
-void createCurlheader(char *mac_header, char *serial_header, char *uuid_header, char *transaction_uuid, struct curl_slist *list, struct curl_slist **header_list)
+void createCurlheader(struct curl_slist *list, struct curl_slist **header_list)
 {
-	mac_header = (char *) malloc(sizeof(char)*MAX_BUF_SIZE);
-	if(mac_header !=NULL)
-	{
-		snprintf(mac_header, MAX_BUF_SIZE, "X-Midt-Mac-Address: %s", get_parodus_cfg()->hw_mac);
-		ParodusPrint("mac_header formed %s\n", mac_header);
-		list = curl_slist_append(list, mac_header);
-		free(mac_header);
-		mac_header = NULL;
-	}
+    char buf[MAX_BUF_SIZE];
+    char *uuid = NULL;
 
-	serial_header = (char *) malloc(sizeof(char)*MAX_BUF_SIZE);
-	if(serial_header !=NULL)
-	{
-		snprintf(serial_header, MAX_BUF_SIZE, "X-Midt-Serial-Number: %s", get_parodus_cfg()->hw_serial_number);
-		ParodusPrint("serial_header formed %s\n", serial_header);
-		list = curl_slist_append(list, serial_header);
-		free(serial_header);
-		serial_header = NULL;
-	}
+    snprintf(buf, MAX_BUF_SIZE, "X-Xmidt-Mac-Address: %s", get_parodus_cfg()->hw_mac);
+    ParodusPrint("mac_header formed %s\n", buf);
+    list = curl_slist_append(list, buf);
 
-	transaction_uuid = generate_trans_uuid();
-	if(transaction_uuid !=NULL)
-	{
-		uuid_header = (char *) malloc(sizeof(char)*MAX_BUF_SIZE);
-		if(uuid_header !=NULL)
-		{
-			snprintf(uuid_header, MAX_BUF_SIZE, "X-Midt-Uuid: %s", transaction_uuid);
-			ParodusInfo("uuid_header formed %s\n", uuid_header);
-			list = curl_slist_append(list, uuid_header);
-			free(transaction_uuid);
-			transaction_uuid = NULL;
-			free(uuid_header);
-			uuid_header = NULL;
-		}
-	}
-	else
-	{
-		ParodusError("Failed to generate transaction_uuid\n");
-	}
-	*header_list = list;
+    snprintf(buf, MAX_BUF_SIZE, "X-Xmidt-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-Xmidt-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-Xmidt-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-Xmidt-Hardware-Model: %s", get_parodus_cfg()->hw_model);
+    list = curl_slist_append(list, buf);
+
+    snprintf(buf, MAX_BUF_SIZE, "X-Xmidt-Hardware-Manufacturer: %s", get_parodus_cfg()->hw_manufacturer);
+    list = curl_slist_append(list, buf);
+
+    snprintf(buf, MAX_BUF_SIZE, "X-Xmidt-Firmware-Name: %s", get_parodus_cfg()->fw_name);
+    list = curl_slist_append(list, buf);
+
+    snprintf(buf, MAX_BUF_SIZE, "X-Xmidt-Protocol: %s", get_parodus_cfg()->webpa_protocol);
+    list = curl_slist_append(list, buf);
+
+    snprintf(buf, MAX_BUF_SIZE, "X-Xmidt-Interface-Used: %s", get_parodus_cfg()->webpa_interface_used);
+    list = curl_slist_append(list, buf);
+
+    snprintf(buf, MAX_BUF_SIZE, "X-Xmidt-Last-Reboot-Reason: %s", get_parodus_cfg()->hw_last_reboot_reason);
+    list = curl_slist_append(list, buf);
+
+    snprintf(buf, MAX_BUF_SIZE, "X-Xmidt-Last-Reconnect-Reason: %s", get_global_reconnect_reason());
+    list = curl_slist_append(list, buf);
+
+    snprintf(buf, MAX_BUF_SIZE, "X-Xmidt-Boot-Retry-Wait: %d", get_parodus_cfg()->boot_retry_wait);
+    list = curl_slist_append(list, buf);
+
+    *header_list = list;
 }

src/client_list.c

@@ -294,3 +294,24 @@ 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;
+}

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

src/config.c

@@ -214,8 +214,13 @@ 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++;
-        parStrncpy (server_addr, remove, server_addr_buflen);
+        for( i = 0; i < server_addr_buflen; i++ ) {
+            server_addr[i] = remove[i];
+        }
         closeBracket = strchr(server_addr,']');
         if(closeBracket != NULL){
             //Remove ] by making it as null

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[64];
+    char hw_last_reboot_reason[128];
     char fw_name[64];
     unsigned int boot_time;
     unsigned int webpa_ping_timeout;

src/connection.c

@@ -62,6 +62,8 @@ enum {
 /*                            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;
 

src/connection.h

@@ -44,7 +44,7 @@ extern "C" {
 * i.e. ping_miss or ping receive after miss
 */
 typedef void (*parodusOnPingStatusChangeHandler) (char * status);
-parodusOnPingStatusChangeHandler on_ping_status_change;
+extern parodusOnPingStatusChangeHandler on_ping_status_change;
 
 /*----------------------------------------------------------------------------*/
 /*                             Function Prototypes                            */

src/crud_internal.c

@@ -26,6 +26,9 @@
 #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);
@@ -33,6 +36,7 @@ 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)
 {
@@ -639,10 +643,17 @@ 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))
+		if((objlevel == 3 && ((obj[3] !=NULL) && strstr(obj[3] ,"tags") == NULL)) || (objlevel == 4 && ((obj[3] !=NULL) && strstr(obj[3] ,"service-status") != NULL)))
 		{
-			inMemStatus = retrieveFromMemory(obj[3], &inMemResponse );
+			//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 );
+			}
 
 			if(inMemStatus == 0)
 			{
@@ -1613,3 +1624,27 @@ 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;
+}

src/main.c

@@ -27,6 +27,7 @@
 #include "breakpad_wrapper.h"
 #endif
 #include "signal.h"
+#include "privilege.h"
 
 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */
@@ -41,7 +42,7 @@ typedef    void    Sigfunc(int);
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
-/* none */
+int numLoops;
 
 /*----------------------------------------------------------------------------*/
 /*                             Function Prototypes                            */
@@ -104,6 +105,7 @@ int main( int argc, char **argv)
     memset(cfg,0,sizeof(ParodusCfg));
     
     ParodusInfo("********** Starting component: Parodus **********\n "); 
+    drop_root_privilege();
     setDefaultValuesToCfg(cfg);
     if (0 != parseCommandLine(argc,argv,cfg)) {
 		abort();

src/privilege.c

@@ -0,0 +1,6 @@
+#include "privilege.h"
+
+void drop_root_privilege()
+{
+
+}

src/privilege.h

@@ -0,0 +1,2 @@
+/* This is a stub function that will be overridden in a patch */
+void drop_root_privilege();

src/upstream.c

@@ -417,12 +417,43 @@ void *processUpstreamMessage()
 								{
 									ParodusError("Failed to get device_id\n");
 								}
-						} else if (WRP_MSG_TYPE__SVC_ALIVE != msgType) {
+						}
+						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) {
 						  /* Don't reply to service alive message */
 							sendUpstreamMsgToServer(&message->msg, message->len);
-						}
 					}
-            	}
+			  }
+		    }
            	}
             else
             {

tests/CMakeLists.txt

@@ -90,16 +90,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
@@ -225,7 +225,7 @@ target_link_libraries (test_crud_tasks -lcmocka ${PARODUS_COMMON_LIBS} )
 #-------------------------------------------------------------------------------
 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/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)
 
 #-------------------------------------------------------------------------------
@@ -236,7 +236,7 @@ add_executable(test_upstream test_upstream.c ../src/upstream.c ../src/close_retr
 target_link_libraries (test_upstream -lcmocka gcov -lcunit -lcimplog
  -lwrp-c -luuid -lpthread -lmsgpackc -lnopoll
  -Wl,--no-as-needed -lcjson -lcjwt -ltrower-base64
- -lssl -lcrypto -lrt -lm)
+ -lssl -lcrypto -lrt -lm -lnanomsg)
 
 #-------------------------------------------------------------------------------
 #   test_upstream_sock
@@ -287,6 +287,7 @@ set(CONIFC_SRC test_conn_interface.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)

tests/test_auth_token.c

@@ -54,7 +54,9 @@ int curl_easy_perform(CURL *curl)
 	  write_callback_fn (msg, 1, strlen(msg), &test_data);
 	return rtn;
 }
-int g_response_code=0;
+
+extern int g_response_code;
+
 void setGlobalResponseCode (int response_code)
 {
 	g_response_code = response_code;
@@ -72,6 +74,12 @@ int curl_easy_getinfo(CURL *curl, CURLINFO CURLINFO_RESPONSE_CODE, long response
 	function_called();
 	return (int) mock();
 }
+
+char* get_global_reconnect_reason()
+{
+    return "none";
+}
+
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/

tests/test_auth_token_more.c

@@ -69,6 +69,13 @@ int curl_easy_getinfo(CURL *curl, CURLINFO CURLINFO_RESPONSE_CODE, long response
 	function_called();
 	return (int) mock();
 }
+
+char* get_global_reconnect_reason()
+{
+    return "none";
+}
+
+
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/

tests/test_client_list.c

@@ -32,6 +32,8 @@ pthread_t test_tid2;
 static void *client_rcv_task();
 static void *client2_rcv_task();
 
+int numLoops;
+
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/

tests/test_config.c

@@ -53,6 +53,11 @@ void create_token_script(char *fname)
     system(command);
 }
 
+char* get_global_reconnect_reason()
+{
+    return "none";
+}
+
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/
@@ -116,6 +121,8 @@ 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()
@@ -299,8 +306,9 @@ void test_loadParodusCfg()
 {
     ParodusCfg  tmpcfg;
     ParodusCfg *Cfg = NULL;
-    Cfg = (ParodusCfg*)malloc(sizeof(ParodusCfg));
     char protocol[32] = {'\0'};
+    Cfg = (ParodusCfg*)malloc(sizeof(ParodusCfg));
+    memset(Cfg, 0, sizeof(ParodusCfg));
 
     parStrncpy(Cfg->hw_model, "TG1682", sizeof(Cfg->hw_model));
     parStrncpy(Cfg->hw_serial_number, "Fer23u948590", sizeof(Cfg->hw_serial_number));
@@ -351,6 +359,14 @@ void test_loadParodusCfg()
     assert_string_equal(tmpcfg.seshat_url, "ipc://tmp/seshat_service.url");
 #endif
 	assert_string_equal(tmpcfg.crud_config_file, "parodus_cfg.json");
+
+    free(tmpcfg.client_cert_path);
+    free(tmpcfg.token_server_url);
+    free(tmpcfg.crud_config_file);
+
+    free(Cfg->crud_config_file);
+    free(Cfg->client_cert_path);
+    free(Cfg->token_server_url);
     free(Cfg);
 }
 
@@ -422,6 +438,8 @@ 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()

tests/test_conn_interface.c

@@ -42,7 +42,8 @@ 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                                    */
@@ -291,9 +292,6 @@ void timespec_diff(struct timespec *start, struct timespec *stop,
    diff->tv_nsec = 1000;
 }
 
-void deleteAllClients (void)
-{
-}
 
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */

tests/test_connection.c

@@ -62,10 +62,8 @@ 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 close_mut; 
 pthread_mutex_t interface_down_mut=PTHREAD_MUTEX_INITIALIZER;
 pthread_cond_t interface_down_con=PTHREAD_COND_INITIALIZER;
 

tests/test_crud_internal.c

@@ -32,9 +32,6 @@
 #include "../src/connection.h"
 #include "../src/close_retry.h"
 
-bool LastReasonStatus;
-pthread_mutex_t close_mut;
-
 char *get_global_reconnect_reason()
 {
     return "parodus_stopping";

tests/test_nopoll_handlers.c

@@ -28,14 +28,11 @@
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
-volatile unsigned int heartBeatTimer;
 bool LastReasonStatus;
 bool interface_down_event = false;
 int closeReason = 0;
-pthread_mutex_t close_mut; 
 pthread_mutex_t interface_down_mut=PTHREAD_MUTEX_INITIALIZER;
 pthread_cond_t interface_down_con=PTHREAD_COND_INITIALIZER;
-bool close_retry;
 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/

tests/test_nopoll_handlers_fragment.c

@@ -30,10 +30,7 @@
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
-volatile unsigned int heartBeatTimer;
 bool LastReasonStatus;
-pthread_mutex_t close_mut;
-bool close_retry;
 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/

tests/test_service_alive.c

@@ -32,6 +32,7 @@ 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;

tests/test_token.c

@@ -160,6 +160,7 @@ 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)
 {

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;