Merge pull request #104 from selvamKrish/hostname-validation

Hostname validation
Add outbound interface to nopoll options
2026-01-27 18:20:04 +00:00 · 2017-06-12 15:06:07 +05:30 · 2017-04-26 11:18:52 +05:30 · 2017-04-24 15:52:27 +05:30 · 2017-04-17 15:00:19 +05:30 · 2017-04-14 17:33:58 +05:30
91 changed files with 2146 additions and 15465 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ addons:
    notification_email: weston_schmidt@alumni.purdue.edu
    build_command_prepend: "mkdir coverity_build && cd coverity_build && cmake .."
    build_command:   "make"
-    branch_pattern: ignore
+    branch_pattern: master
    
 before_install:
    - sudo pip install codecov
@@ -21,14 +21,13 @@ before_install:

 install:
    - sudo apt-get update -qq
-    - sudo apt-get install -y -qq check libcunit1 libcunit1-dev uuid-dev valgrind
+    - sudo apt-get install -y -qq libcunit1 libcunit1-dev uuid-dev

 script:
    - mkdir build
    - cd build
-    - cmake .. -DINTEGRATION_TESTING:BOOL=false -DDISABLE_VALGRIND:BOOL=false -DENABLE_SESHAT:BOOL=true -DFEATURE_DNS_QUERY:BOOL=true
+    - cmake .. -DINTEGRATION_TESTING:BOOL=false
    - make
-    - export ARGS="-V"
    - make test

 after_success:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,66 +0,0 @@
-# Changelog
-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]
- Refactored connection.c and updated corresponding unit tests
- Additional `/cloud-status` and `/cloud-disconnect` fields.
- Switched from nanomsg (Release 1.1.2) to NNG (Release v1.0.1)
- Memory leak fixes
- Changed connection logic (connection.c) for retries, and added unit test
- Partner-id comparison made case insensitive
- Reverted from NNG to nanomag (v1.1.2)
- reverted temporary CMake reference to https://github.com/bill1600/seshat
- Added log for time difference of parodus connect time and boot time
- added NULL check for device mac id in upstream retrieve message handling
- backoff retry to include find_servers in loop (connection.c)
- backoff max is max count not max delay
- used mutex protection to make client list and nn_sends thread safe
- put mutex lock into get_global_node
- change svc alive from a thread to a function called every 30 sec from main
- shut down tasks properly
- fix memory leaks
- Fixed memory leak in upstream event message flow
- Fixed crash in CRUD request processing
- Fixed issue on RETRIEVE respone processing
- Enabled valgrind
- Fixed main loop to keep calling svc_alive_task during a cloud disconnect and retry
- change svc alive back to a separate thread.  Shut it down with pthread_cond_timedwait
- Refactored Upsteam RETRIEVE flow
-
-## [1.0.1] - 2018-07-18
-### Added
- Added command line arguments for secure token read and acquire.
- DNS check for <device-id>.<URL> to allow custom device handling logic (like test boxes, refurbishing, etc).
- Add check for matching `partner-id` for incoming WRP messages based on command line argument passed.
- CRUD operations to local namespace is now supported.
- Via CRUD calls, the custom metadata tag values are now supported.
-
-### Changed
- Configurable security flag and port.
- Default HTTP port to 80 and HTTPS port to 443.
- Updates to how `nopoll` is called have been implemented.
-
-### Fixed
- 64 bit pointer fixes (#144, #145).
- Handle `403` error from talaria (#147).
- Several additional NULL pointer checks & recovery logic blocks added.
- A scenario where ping requests are not responded to was fixed. 
-
-### Security
- Added command line arguments for secure token read and acquire.  Token presented to cloud for authentication verification.
-
-## [1.0.0] - 2017-11-17
-### Added
- Added the basic implementation.
-
-## [0.0.1] - 2016-08-15
-### Added
- Initial creation
-
-[Unreleased]: https://github.com/Comcast/parodus/compare/1.0.1...HEAD
-[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/CLA.pdf
+++ b/CLA.pdf
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,8 +22,6 @@ include(CTest)
 set(INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/_install)
 set(PREFIX_DIR ${CMAKE_CURRENT_BINARY_DIR}/_prefix)
 set(INCLUDE_DIR ${INSTALL_DIR}/include)
-set(INCLUDE_UCRESOLV ${PREFIX_DIR}/ucresolv/src/ucresolv/include)
-set(PATCHES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/patches)
 set(LIBRARY_DIR ${INSTALL_DIR}/lib)
 set(LIBRARY_DIR64 ${INSTALL_DIR}/lib64)
 set(COMMON_LIBRARY_DIR ${INSTALL_DIR}/lib/${CMAKE_LIBRARY_ARCHITECTURE})
@@ -38,19 +36,8 @@ include_directories(${INCLUDE_DIR}
                    ${INCLUDE_DIR}/wrp-c                   
                    ${INCLUDE_DIR}/libparodus
                    ${INCLUDE_DIR}/cimplog
-                    ${INCLUDE_DIR}/cjwt
-					)	
-
-# Get git commit hash 
-#-------------------------------------------------------------------------------
-execute_process(
-  COMMAND git describe --tags --always
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  OUTPUT_VARIABLE GIT_COMMIT_TAG
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-add_definitions("-DGIT_COMMIT_TAG=\"${GIT_COMMIT_TAG}\"")	
+                    ${INCLUDE_DIR}/libseshat
+                   )

 # Compile options/flags
 #-------------------------------------------------------------------------------
@@ -72,8 +59,8 @@ if (NOT BUILD_YOCTO)
 ExternalProject_Add(trower-base64
    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/trower-base64
    GIT_REPOSITORY https://github.com/Comcast/trower-base64.git
-    GIT_TAG "v1.1.1"
-    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_TESTING=OFF
+    GIT_TAG "master"
+    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
 )
 add_library(libtrower-base64 STATIC SHARED IMPORTED)
 add_dependencies(libtrower-base64 trower-base64)
@@ -81,11 +68,19 @@ add_dependencies(libtrower-base64 trower-base64)

 # nopoll external dependency
 #-------------------------------------------------------------------------------
+set(NOPOLL_LOG_SRC ${PREFIX_DIR}/nopoll/src/nopoll/src/nopoll_log.c)
 ExternalProject_Add(nopoll
    PREFIX ${PREFIX_DIR}/nopoll
-    GIT_REPOSITORY https://github.com/Comcast/nopoll.git
-    GIT_TAG "1.0.1"
-    CONFIGURE_COMMAND COMMAND <SOURCE_DIR>/autogen.sh --prefix=${PREFIX}
+    GIT_REPOSITORY https://github.com/selvamKrish/nopoll.git
+    GIT_TAG "testing-branch"
+    PATCH_COMMAND ""
+    COMMAND touch NEWS README AUTHORS ChangeLog
+    COMMAND libtoolize --force
+    COMMAND aclocal
+    COMMAND autoheader --warnings=error
+    COMMAND automake --add-missing -Werror
+    COMMAND autoconf --force --warnings=error
+    CONFIGURE_COMMAND COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX}
                                                     --includedir=${INCLUDE_DIR}
                                                     --libdir=${LIBRARY_DIR}
                                                     ${CUSTOM_HOST}
@@ -100,7 +95,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.2"
+    #GIT_TAG "096998834451219ee7813d8977f6a4027b0ccb43"
    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
 )
 add_library(libnanomsg STATIC SHARED IMPORTED)
@@ -113,8 +108,8 @@ ExternalProject_Add(cJSON
    #PREFIX ${PREFIX_DIR}/cJSON
    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/cJSON
    GIT_REPOSITORY https://github.com/DaveGamble/cJSON.git
-    GIT_TAG "v1.7.8"
-    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_TESTING=OFF
+    GIT_TAG "aafb64a1c549b7b927e339df6d35b1d5059dc235"
+    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
 )
 add_library(libcJSON STATIC SHARED IMPORTED)
 add_dependencies(libcJSON cJSON)
@@ -125,7 +120,7 @@ add_dependencies(libcJSON cJSON)
 ExternalProject_Add(msgpack
    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/msgpack
    GIT_REPOSITORY https://github.com/msgpack/msgpack-c.git
-    GIT_TAG "cpp-3.1.1"
+    GIT_TAG "c6e6dbc608366090c12b142b3832604e6aa12f54"
    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
                  -DMSGPACK_ENABLE_CXX=OFF
                  -DMSGPACK_BUILD_EXAMPLES=OFF
@@ -139,8 +134,8 @@ add_dependencies(libmsgpack msgpack)
 ExternalProject_Add(cimplog
    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/cimplog
    GIT_REPOSITORY https://github.com/Comcast/cimplog.git
-    GIT_TAG "1.0.1"
-    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_TESTING=OFF
+    GIT_TAG "master"
+    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
 )
 add_library(libcimplog STATIC SHARED IMPORTED)
 add_dependencies(libcimplog cimplog)
@@ -149,79 +144,45 @@ add_dependencies(libcimplog cimplog)
 # wrp-c external dependency
 #-------------------------------------------------------------------------------
 ExternalProject_Add(wrp-c
-	DEPENDS trower-base64 msgpack cimplog
    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/wrp-c
    GIT_REPOSITORY https://github.com/Comcast/wrp-c.git
-    GIT_TAG "1.0.1"
+    GIT_TAG "master"
    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
                  -DMSGPACK_ENABLE_CXX=OFF
                  -DMSGPACK_BUILD_EXAMPLES=OFF
                  -DBUILD_TESTING=OFF
-                  -DMAIN_PROJ_BUILD=ON
-                  -DMAIN_PROJ_LIB_PATH=${LIBRARY_DIR}
-    		  -DMAIN_PROJ_INCLUDE_PATH=${INCLUDE_DIR}
 )
 add_library(libwrp-c STATIC SHARED IMPORTED)
 add_dependencies(libwrp-c wrp-c)

+# libparodus external dependency
+#-------------------------------------------------------------------------------
+ExternalProject_Add(libparodus
+    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/libparodus
+    GIT_REPOSITORY https://github.com/Comcast/libparodus.git
+    GIT_TAG "master"
+    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
+)
+add_library(liblibparodus STATIC SHARED IMPORTED)
+add_dependencies(liblibparodus libparodus)

-if (ENABLE_SESHAT)
 # libseshat external dependency
 #-------------------------------------------------------------------------------
 ExternalProject_Add(libseshat
-    DEPENDS cJSON trower-base64 msgpack nanomsg wrp-c
    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/libseshat
-    GIT_REPOSITORY https://github.com/Comcast/seshat.git
-    GIT_TAG "1.0.1"
-    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_TESTING=OFF
-    	          -DMAIN_PROJ_BUILD=ON
-    	          -DMAIN_PROJ_LIB_PATH=${LIBRARY_DIR}
-    	          -DMAIN_PROJ_LIB64_PATH=${LIBRARY_DIR64}
-    		  -DMAIN_PROJ_COMMON_PATH=${COMMON_LIBRARY_DIR}
-    		  -DMAIN_PROJ_INCLUDE_PATH=${INCLUDE_DIR}
+    GIT_REPOSITORY https://github.com/comcast/seshat.git
+    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
 )
 add_library(liblibseshat STATIC SHARED IMPORTED)
 add_dependencies(liblibseshat libseshat)
-include_directories(${INCLUDE_DIR}/libseshat)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_SESHAT ")
-endif (ENABLE_SESHAT)
-
-# libcjwt external dependency
-#-------------------------------------------------------------------------------
-ExternalProject_Add(cjwt
-    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/cjwt
-    GIT_REPOSITORY https://github.com/Comcast/cjwt.git
-    GIT_TAG "1b023c41bb2d6dbbf493c202ed81f06c84d5b51b"
-    #GIT_TAG "1.0.1"
-    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_TESTING=OFF
-)
-add_library(libcjwt STATIC SHARED IMPORTED)
-add_dependencies(libcjwt cjwt)
-
-if (FEATURE_DNS_QUERY)
-# libucresolv external dependency
-#-------------------------------------------------------------------------------
-ExternalProject_Add(ucresolv
-    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/ucresolv
-    GIT_REPOSITORY https://github.com/Comcast/libucresolv.git
-    GIT_TAG "1.0.0"
-    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
-)
-add_library(libucresolv STATIC SHARED IMPORTED)
-add_dependencies(libucresolv ucresolv)
-include_directories(${INCLUDE_DIR}
-                    ${INCLUDE_DIR}/ucresolv
-					)		
-
-endif (FEATURE_DNS_QUERY)

 if (BUILD_TESTING)
 # cmocka external dependency
 #-------------------------------------------------------------------------------
 ExternalProject_Add(cmocka
    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/cmocka
-    GIT_REPOSITORY https://github.com/elventear/cmocka.git
-    GIT_TAG "b71a3060699bc1a5b00e958be353772f42545ac2"
+    GIT_REPOSITORY https://git.cryptomilk.org/projects/cmocka.git
+    GIT_TAG "master"
    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
 )
 add_library(libcmocka STATIC SHARED IMPORTED)
@@ -229,15 +190,7 @@ add_dependencies(libcmocka cmocka)

 endif (BUILD_TESTING)

-endif () # NOT BUILD_YOCTO
-
-if (BUILD_YOCTO)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBUILD_YOCTO ")
-endif (BUILD_YOCTO)
-
-if (FEATURE_DNS_QUERY)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFEATURE_DNS_QUERY ")
-endif (FEATURE_DNS_QUERY)
+endif ()

 link_directories ( ${LIBRARY_DIR} ${COMMON_LIBRARY_DIR} ${LIBRARY_DIR64} )
 add_subdirectory(src)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,31 +1,5 @@
-Contribution Guidelines
-=======================
+If you would like to contribute code to this project you can do so
+through GitHub by forking the repository and sending a pull request.

-We love to see contributions to the project and have tried to make it easy to do so. If you would like to contribute code to this project you can do so through GitHub by forking the repository and sending a pull request.
-
-Before Comcast merges your code into the project you must sign the [Comcast Contributor License Agreement (CLA)](https://gist.github.com/ComcastOSS/a7b8933dd8e368535378cda25c92d19a).
-
-If you haven't previously signed a Comcast CLA, you'll automatically be asked to when you open a pull request. Alternatively, we can e-mail you a PDF that you can sign and scan back to us. Please send us an e-mail or create a new GitHub issue to request a PDF version of the CLA.
-
-For more details about contributing to GitHub projects see
-http://gun.io/blog/how-to-github-fork-branch-and-pull-request/
-
-Documentation
-------------
-
-If you contribute anything that changes the behavior of the
-application, document it in the [README](https://github.com/Comcast/parodus/blob/master/README.md) or [wiki](https://github.com/Comcast/parodus/wiki)! This includes new features, additional variants of behavior and breaking changes.
-
-Testing
-------
-
-Tests are written using golang's standard testing tools, and are run prior to the PR being accepted.
-
-Pull Requests
-------------
-
-* should be narrowly focused with no more than 3 or 4 logical commits
-* when possible, address no more than one issue
-* should be reviewable in the GitHub code review tool
-* should be linked to any issues it relates to (i.e. issue number after (#) in commit messages or pull request message)
-* should conform to idiomatic golang code formatting
+Before Comcast accepts your code into the project you must sign the
+Comcast Contributor License Agreement ('CLA.pdf').
--- a/16
+++ b/16
@@ -1,16 +0,0 @@
-parodus
-Copyright 2017 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.
-
-This product includes software developed at Comcast (http://www.comcast.com/).
--- a/README.md
+++ b/README.md
@@ -1,16 +1,11 @@
 # parodus

+C implementation of the WebPA client coordinator
+
 [![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)
 [![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
-
-XMiDT is a highly scalable, highly available, generic message routing system.
-
 # Building and Testing Instructions

 ```
@@ -20,79 +15,3 @@ cmake ..
 make
 make test
 ```
-# Command line Arguments needed to start parodus
-
-```
- /hw-model -The hardware model name.
-
- /hw-serial-number -The serial number.
-
- /hw-manufacturer -The device manufacturer.
-
- /hw-mac -The MAC address used to manage the device.
-
- /hw-last-reboot-reason -The last known reboot reason.
-
- /fw-name -The firmware name.
-
- /boot-time -The boot time in unix time.
-
- /webpa-url -The URL that the WRP client should reach out to. (required). Must begin with 'https://' or 'http://'.  May end with a port number. If no port specified, then 443 is assumed for https, 80 for http.
-
- /webpa-backoff-max -The maximum value of c in the binary backoff algorithm
-
- /webpa-ping-timeout -The maximum time to wait between pings before assuming the connection is broken.
-
- /webpa-interface-used -The device interface being used to connect to the cloud.
-
- /parodus-local-url -Parodus local server url (optional argument)
-
- /partner-id -  Partner ID of broadband gateway (optional argument)
-
- /ssl-cert-path -Provide the certs for establishing secure connection (optional argument)
-
- /force-ipv4 -Forcefully connect parodus to ipv4 address (optional argument)
-
- /force-ipv6 -Forcefully connect parodus to ipv6 address (optional argument)
-
- /token-read-script -Script to get auth token for establishing secure connection (absolute path where that script is present) -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 
-
-
-# if ENABLE_SESHAT is enabled
- /seshat-url - The seshat server url 
-
-# if FEATURE_DNS_QUERY is enabled then below mentioned arguments are needed
-
- /acquire-jwt - this parameter (0 or 1) specifies whether there will be a dns lookup. If not, or if any problem occurs with the dns lookup, then webpa-url will be the target. 
-
- /dns-txt-url  - this parameter is used along with the hw_mac parameter to create the dns txt record id
-
- /jwt-algo -Allowed algorithm used for communication
-
- /jwt-public-key-file -JWT token validation key
-
-```
-
-# Sample parodus start commands:
-
-```
-# 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=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=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=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
@@ -11,18 +11,8 @@
 #   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.
-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 
-	crud_interface.c crud_tasks.c crud_internal.c close_retry.c)
-
-if (ENABLE_SESHAT)
-set(SOURCES ${SOURCES} seshat_interface.c)
-else()
-set(SOURCES ${SOURCES} seshat_interface_stub.c)
-endif (ENABLE_SESHAT)
-
+set(SOURCES main.c mutex.c networking.c nopoll_helpers.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)

 add_executable(parodus ${SOURCES})

@@ -32,6 +22,7 @@ target_link_libraries (parodus
    -lmsgpackc
    -ltrower-base64
    -lnopoll
+    -llibseshat
    -luuid
    -lm
    -lcimplog
@@ -39,18 +30,7 @@ target_link_libraries (parodus
    -lcrypto
    -lnanomsg
    -lcjson
-    -lcjwt
    -lpthread
    -lrt
    )
-
-if (FEATURE_DNS_QUERY)
-target_link_libraries (parodus -lucresolv -lresolv)
-endif (FEATURE_DNS_QUERY)
-
-if (ENABLE_SESHAT)
-target_link_libraries (parodus -llibseshat)
-endif (ENABLE_SESHAT)
-
-
 install (TARGETS parodus DESTINATION bin)
--- a/src/ParodusInternal.c
+++ b/src/ParodusInternal.c
@@ -1,24 +1,9 @@
-/**
- * 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 ParodusInternal.c
 *
 * @description This file is used to manage internal functions of parodus
 *
+ * Copyright (c) 2015  Comcast
 */
 
 #include "ParodusInternal.h"
@@ -87,10 +72,6 @@ char* getWebpaConveyHeader()
     	ParodusError("Failed to GET Reconnect reason value\n");
    }
 	
-	if(get_parodus_cfg()->boot_retry_wait > 0)
-	{
-	    cJSON_AddNumberToObject(response, BOOT_RETRY_WAIT, get_parodus_cfg()->boot_retry_wait);
-	}
    buffer = cJSON_PrintUnformatted(response);
    ParodusInfo("X-WebPA-Convey Header: [%zd]%s\n", strlen(buffer), buffer);

@@ -116,26 +97,6 @@ char* getWebpaConveyHeader()
 	    encodedData[j]='\0';
 	    ParodusPrint("Encoded X-WebPA-Convey Header: [%zd]%s\n", strlen(encodedData), encodedData);
    }
-    free(buffer);
-    cJSON_Delete(response);

-    if( 0 < strlen(encodedData) ) {
-        return encodedData;
-    }
-
-    return NULL;
-}
-
-void timespec_diff(struct timespec *start, struct timespec *stop,
-                   struct timespec *diff)
-{
-    if ((stop->tv_nsec - start->tv_nsec) < 0) {
-        diff->tv_sec = stop->tv_sec - start->tv_sec - 1;
-        diff->tv_nsec = stop->tv_nsec - start->tv_nsec + 1000000000UL;
-    } else {
-        diff->tv_sec = stop->tv_sec - start->tv_sec;
-        diff->tv_nsec = stop->tv_nsec - start->tv_nsec;
-    }
-
-    return;
+    return encodedData;
 }
--- a/src/ParodusInternal.h
+++ b/src/ParodusInternal.h
@@ -1,24 +1,9 @@
-/**
- * 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 ParodusInternal.h
 *
 * @description This file is used to manage internal functions of parodus
 *
+ * Copyright (c) 2015  Comcast
 */
 #ifndef _PARODUSINTERNAL_H_
 #define _PARODUSINTERNAL_H_
@@ -50,8 +35,7 @@
 /*                                   Macros                                   */
 /*----------------------------------------------------------------------------*/
 #define UNUSED(x) (void )(x)
-#define NANO_SOCKET_SEND_TIMEOUT_MS                     2000
-#define NANO_SOCKET_RCV_TIMEOUT_MS			500
+#define NANOMSG_SOCKET_TIMEOUT_MSEC                      2000

 #ifndef TEST
 #define FOREVER()   1
@@ -60,12 +44,6 @@ extern int numLoops;
 #define FOREVER()   numLoops--
 #endif

-// Return values for find_servers() in connection.c
-#define FIND_SUCCESS 0
-#define FIND_INVALID_DEFAULT -2
-#define FIND_JWT_FAIL -1
-
-
 /*----------------------------------------------------------------------------*/
 /*                               Data Structures                              */
 /*----------------------------------------------------------------------------*/
@@ -78,63 +56,10 @@ typedef struct ParodusMsg__
 	struct ParodusMsg__ *next;
 } ParodusMsg;

-// Used in token.c to get jwt from dns server
-typedef struct {
-	const char *rr_ptr;
-	int rr_len;
-} rr_rec_t;
-
-//------------ Used in comnection.c -----------------
-typedef struct {
-  int allow_insecure;
-  char *server_addr;  // must be freed
-  unsigned int port;
-} server_t;
-
-typedef struct {
-  server_t defaults;	// from command line
-  server_t jwt;		// from jwt endpoint claim
-  server_t redirect;	// from redirect response to
-			//  nopoll_conn_wait_until_connection_ready
-} server_list_t;
-
-//---- Used in connection.c for expire timer
-typedef struct {
-  int running;
-  struct timespec start_time;
-  struct timespec end_time;
-} expire_timer_t;
-
-//--- Used in connection.c for backoff delay timer
-typedef struct {
-  int count;
-  int max_count;
-  int delay;
-} backoff_timer_t;
-
-//--- Used in connection.c for init_header_info
-typedef struct {
-  char *conveyHeader;	// Do not free
-  char *device_id;	// Need to free
-  char *user_agent;	// Need to free
-} header_info_t;
-
-// connection context which is defined in createNopollConnection
-// and passed into functions keep_retrying_connect, connect_and_wait,
-// wait_connection_ready, and nopoll_connect 
-typedef struct {
-  noPollCtx *nopoll_ctx;
-  server_list_t server_list;
-  server_t *current_server;
-  header_info_t header_info;
-  char *extra_headers;		// need to be freed
-  expire_timer_t connect_timer;
-} create_connection_ctx_t;
-
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
-extern bool g_shutdown;
+extern bool LastReasonStatus;
 extern ParodusMsg *ParodusMsgQ;
 int numLoops;
 /*----------------------------------------------------------------------------*/
@@ -151,12 +76,6 @@ void parStrncpy(char *destStr, const char *srcStr, size_t destSize);

 char* getWebpaConveyHeader();

-void *CRUDHandlerTask();
-void addCRUDmsgToQueue(wrp_msg_t *crudMsg);
-
-void timespec_diff(struct timespec *start, struct timespec *stop,
-                   struct timespec *result);
-
 #ifdef __cplusplus
 }
 #endif
--- a/src/client_list.c
+++ b/src/client_list.c
@@ -1,24 +1,9 @@
-/**
- * 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 client_list.h
 *
 * @description This file is used to manage registered clients
 *
+ * Copyright (c) 2015  Comcast
 */

 #include "ParodusInternal.h"
@@ -30,7 +15,6 @@
 /*----------------------------------------------------------------------------*/
 static int numOfClients = 0;
 static reg_list_item_t * g_head = NULL;
-pthread_mutex_t client_mut=PTHREAD_MUTEX_INITIALIZER;

 /*----------------------------------------------------------------------------*/
 /*                             External functions                             */
@@ -38,16 +22,9 @@ pthread_mutex_t client_mut=PTHREAD_MUTEX_INITIALIZER;

 reg_list_item_t * get_global_node(void)
 {
-    pthread_mutex_lock (&client_mut);
    return g_head;
 }

-void release_global_node (void)
-{
-    pthread_mutex_unlock (&client_mut);
-}
-
-
 int get_numOfClients()
 {
    return numOfClients;
@@ -60,12 +37,11 @@ int addToList( wrp_msg_t **msg)
    int rc = -1;
    int sock;
    int retStatus = -1;
-
    sock = nn_socket( AF_SP, NN_PUSH );
    ParodusPrint("sock created for adding entries to list: %d\n", sock);
    if(sock >= 0)
    {
-            int t = NANO_SOCKET_SEND_TIMEOUT_MS;
+            int t = NANOMSG_SOCKET_TIMEOUT_MSEC;
            rc = nn_setsockopt(sock, NN_SOL_SOCKET, NN_SNDTIMEO, &t, sizeof(t));
            if(rc < 0)
            {
@@ -93,8 +69,9 @@ int addToList( wrp_msg_t **msg)
 	                ParodusPrint("(*msg)->u.reg.service_name is %s\n", (*msg)->u.reg.service_name);
 	                ParodusPrint("(*msg)->u.reg.url is %s\n", (*msg)->u.reg.url);

-	                parStrncpy(new_node->service_name, (*msg)->u.reg.service_name, sizeof(new_node->service_name));
-	                parStrncpy(new_node->url, (*msg)->u.reg.url, sizeof(new_node->url));
+	                strncpy(new_node->service_name, (*msg)->u.reg.service_name, strlen((*msg)->u.reg.service_name)+1);
+	                strncpy(new_node->url, (*msg)->u.reg.url, strlen((*msg)->u.reg.url)+1);
+
 	                new_node->next=NULL;
 	                 
 	                if (g_head == NULL) //adding first client
@@ -223,7 +200,7 @@ int deleteFromList(char* service_name)
 			curr_node = NULL;
 			ParodusInfo("Deleted successfully and returning..\n");
 			numOfClients =numOfClients - 1;
-			ParodusPrint("numOfClients after delete is %d\n", numOfClients);
+			ParodusPrint("numOfClients after delte is %d\n", numOfClients);
 			return 0;
 		}
 		
@@ -233,49 +210,3 @@ int deleteFromList(char* service_name)
 	ParodusError("Could not find the entry to delete from list\n");
 	return -1;
 }
-
-void deleteAllClients (void)
-{
-  reg_list_item_t *next_node = NULL;
-
-  while (NULL != g_head)
-  {
-    next_node = g_head->next;
-    free (g_head);
-    g_head = next_node;
-  }
-  if (numOfClients > 0) {
-    ParodusInfo ("Deleted %d clients\n", numOfClients);
-    numOfClients = 0;
-  }
-}
-
-/*
-*@dest : Client destination to send message
-*@Msg:	Msg to send it to client (No free done here), user responsibilites to free the msg
-*@msgSize : Total size of the msg to send to client
-*/
-int sendMsgtoRegisteredClients(char *dest,const char **Msg,size_t msgSize)
-{
-	int bytes =0;
-	reg_list_item_t *temp = NULL;
-	temp = get_global_node();
-	//Checking for individual clients & Sending msg to registered client
-	while (NULL != temp)
-	{
-		ParodusPrint("node is pointing to temp->service_name %s \n",temp->service_name);
-		// Sending message to registered clients
-		if( strcmp(dest, temp->service_name) == 0)
-		{
-			bytes = nn_send(temp->sock, *Msg, msgSize, 0);
-			release_global_node ();
-			ParodusInfo("sent downstream message to reg_client '%s'\n", temp->url);
-			ParodusPrint("downstream bytes sent:%d\n", bytes);
-			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
@@ -1,24 +1,9 @@
-/**
- * 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 client_list.h
 *
 * @description This file is used to manage registered clients
 *
+ * Copyright (c) 2015  Comcast
 */
 #ifndef _CLIENTLIST_H_
 #define _CLIENTLIST_H_
@@ -50,11 +35,8 @@ int sendAuthStatus(reg_list_item_t *new_node);

 int deleteFromList(char* service_name);
 int get_numOfClients();
-void deleteAllClients (void);
-int sendMsgtoRegisteredClients(char *dest,const char **Msg,size_t msgSize);

 reg_list_item_t * get_global_node(void);
-void release_global_node (void);

 #ifdef __cplusplus
 }
--- a/src/close_retry.c
+++ b/src/close_retry.c
@@ -1,56 +0,0 @@
-/**
- * Copyright 2018 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 close_retry.c
- *
- * @description Functions required to manage connection close retry.
- *
- */
-
-#include "close_retry.h"
-
-bool close_retry = false;
-
-pthread_mutex_t close_mut=PTHREAD_MUTEX_INITIALIZER;
-
-// Get value of close_retry
-bool get_close_retry() 
-{
-	bool tmp = false;
-	pthread_mutex_lock (&close_mut);
-	tmp = close_retry;
-	pthread_mutex_unlock (&close_mut);
-	return tmp;
-}
-
-// Reset value of close_retry to false
-void reset_close_retry() 
-{
-	pthread_mutex_lock (&close_mut);
-	close_retry = false;
-	pthread_mutex_unlock (&close_mut);
-}
-
-// set value of close_retry to true
-void set_close_retry() 
-{
-	pthread_mutex_lock (&close_mut);
-    close_retry = true;
-    pthread_mutex_unlock (&close_mut);
-}
-
-
--- a/src/close_retry.h
+++ b/src/close_retry.h
@@ -1,47 +0,0 @@
-/**
- * Copyright 2018 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 close_retry.h
- *
- * @description Functions required to manage connection close retry.
- *
- */
-
-#ifndef _CLOSERETRY_H_
-#define _CLOSERETRY_H_
-
-#include <pthread.h>
-#include <stdbool.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Get value of close_retry
-bool get_close_retry();
-
-// Reset value of close_retry to false
-void reset_close_retry();
-
-// Set value of close_retry to true
-void set_close_retry();
-
-#ifdef __cplusplus
-}
-#endif
-    
-#endif
--- a/src/config.c
+++ b/src/config.c
@@ -1,41 +1,19 @@
 /**
- * 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 config.c
+ * @file config.h
 *
 * @description This file contains configuration details of parodus
 *
+ * Copyright (c) 2015  Comcast
 */
-
-#include <stdio.h>
-#include <fcntl.h> 
+ 
 #include "config.h"
 #include "ParodusInternal.h"
-#include <cjwt/cjwt.h>
-
-#define MAX_BUF_SIZE	128

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

 static ParodusCfg parodusCfg;
-static unsigned int rsa_algorithms = 
-	(1<<alg_rs256) | (1<<alg_rs384) | (1<<alg_rs512);

 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
@@ -48,373 +26,35 @@ ParodusCfg *get_parodus_cfg(void)

 void set_parodus_cfg(ParodusCfg *cfg) 
 {
-    memcpy(&parodusCfg, cfg, sizeof(ParodusCfg));
+    parodusCfg = *cfg;
 }

-void set_cloud_disconnect_reason(ParodusCfg *cfg, char *disconn_reason)
+void parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
 {
-    cfg->cloud_disconnect = strdup(disconn_reason);
-}
-
-void reset_cloud_disconnect_reason(ParodusCfg *cfg)
-{
-	cfg->cloud_disconnect = NULL;
-}
-
-
-const char *get_tok (const char *src, int delim, char *result, int resultsize)
-{
-	int i;
-	char c;
-	int endx = resultsize-1;
-
-	memset (result, 0, resultsize);
-	for (i=0; (c=src[i]) != 0; i++) {
-		if (c == delim)
-			break;
- 		if (i < endx)
-			result[i] = c;
-	}
-	if (c == 0)
-		return NULL;
-	return src + i + 1;
-}
-
-// the algorithm mask indicates which algorithms are allowed
-unsigned int get_algo_mask (const char *algo_str)
-{
-  unsigned int mask = 0;
-  unsigned int mask_val;
-#define BUFLEN 16
-  char tok[BUFLEN];
-	int alg_val;
-
-	while(NULL != algo_str)
-	{
-		algo_str = get_tok (algo_str, ':', tok, BUFLEN);
-		alg_val = cjwt_alg_str_to_enum (tok);
-		if ((alg_val < 0)  || (alg_val >= num_algorithms)) {
-       ParodusError("Invalid jwt algorithm %s\n", tok);
-       return (unsigned int) (-1);
-		}
-		if (alg_val == alg_none) {
-       ParodusError("Disallowed jwt algorithm none\n");
-       return (unsigned int) (-1);
-		}
-		mask_val = (1<<alg_val);
-#if !ALLOW_NON_RSA_ALG
-		if (0 == (mask_val & rsa_algorithms)) {
-       ParodusError("Disallowed non-rsa jwt algorithm %s\n", tok);
-       return (unsigned int) (-1);
-		}
-#endif
-		mask |= mask_val;
-		
-	}
-	return mask;
-#undef BUFLEN
-}
-
-static int open_input_file (const char *fname)
-{
-  int fd = open(fname, O_RDONLY);
-  if (fd<0)
-  {
-    ParodusError ("File %s open error\n", fname);
-    abort ();
-  }
-  return fd;
-} 
-
-void read_key_from_file (const char *fname, char *buf, size_t buflen)
-{
-  ssize_t nbytes;
-  int fd = open_input_file(fname);
-  nbytes = read(fd, buf, buflen);
-  if (nbytes < 0)
-  {
-    ParodusError ("Read file %s error\n", fname);
-    close(fd);
-    abort ();
-  }
-  close(fd);
-  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)
-{
-	int count = 0;
-	int i;
-	char c;
-
-	for (i=0; (c=arg[i]) != 0; i++) {
-		if (c !=':')
-			count++;
-	}
-	if (count != 12)
-		return -1;			// bad mac address
-	for (i=0; (c=arg[i]) != 0; i++) {
-		if (c != ':')
-			*(target++) = c;
-	}
-	*target = 0;	// terminating null
-	return 0;
-}
-
-int server_is_http (const char *full_url,
-	const char **server_ptr)
-{
-	int http_match;
-	const char *ptr;
-	
-	if (strncmp(full_url, "https://", 8) == 0) {
-		http_match = 0;
-		ptr = full_url + 8;
-	} else if (strncmp(full_url, "http://", 7) == 0) {
-		http_match = 1;
-		ptr = full_url + 7;	
-	} else {
-		ParodusError ("Invalid url %s\n", full_url);
-		return -1;
-	}
-	if (NULL != server_ptr)
-		*server_ptr = ptr;
-	return http_match;
-}
-	
-	
-int parse_webpa_url__ (const char *full_url, 
-	char *server_addr, int server_addr_buflen,
-	char *port_buf, int port_buflen)
-{
-	const char *server_ptr;
-	char *port_val;
-	char *end_port;
-	size_t server_len;
-	int http_match;
-	char *closeBracket = NULL;
-	char *openBracket = NULL;
-	char *checkPort = NULL;
-
-	ParodusInfo ("full url: %s\n", full_url);
-	http_match = server_is_http (full_url, &server_ptr);
-	if (http_match < 0)
-		return http_match;
-
-	ParodusInfo ("server address copied from url\n");
-	parStrncpy (server_addr, server_ptr, server_addr_buflen);
-	server_len = strlen(server_addr);
-	// If there's a '/' on end, null it out
-	if ((server_len>0) && (server_addr[server_len-1] == '/'))
-		server_addr[server_len-1] = '\0';
-
-    openBracket = strchr(server_addr,'[');
-    if(openBracket != NULL){
-        //Remove [ from server address
-        char *remove = server_addr;
-        remove++;
-        parStrncpy (server_addr, remove, server_addr_buflen);
-        closeBracket = strchr(server_addr,']');
-        if(closeBracket != NULL){
-            //Remove ] by making it as null
-            *closeBracket = '\0';
-            closeBracket++;
-            checkPort = strchr(closeBracket,':');
-            if (NULL == checkPort) {
-                if (http_match)
-                    parStrncpy (port_buf, "80", port_buflen);
-                else
-                    parStrncpy (port_buf, "443", port_buflen);
-            } else {
-                checkPort++;
-                end_port = strchr (checkPort, '/');
-                if (NULL != end_port)
-                    *end_port = '\0'; // terminate port with null
-                parStrncpy (port_buf, checkPort, port_buflen);
-            }
-
-        }else{
-            ParodusError("Invalid url %s\n", full_url);
-            return -1;
-        }
-    }else if (strchr(server_addr,']') != NULL ){
-		ParodusError("Invalid url %s\n", full_url);
-		return -1;
-	}else{
-	// Look for ':'
-	port_val = strchr (server_addr, ':');
-
-	if (NULL == port_val) {
-		if (http_match)
-			parStrncpy (port_buf, "80", port_buflen);
-		else
-			parStrncpy (port_buf, "443", port_buflen);
-		end_port = strchr (server_addr, '/');
-		if (NULL != end_port) {
-			*end_port = '\0'; // terminate server address with null
-		}
-
-	} else {
-		*port_val = '\0'; // terminate server address with null
-		port_val++;
-		end_port = strchr (port_val, '/');
-		if (NULL != end_port)
-			*end_port = '\0'; // terminate port with null
-		parStrncpy (port_buf, port_val, port_buflen);
-	}
-    }
-	ParodusInfo ("server %s, port %s, http_match %d\n", 
-		server_addr, port_buf, http_match);
-	return http_match;
-
-}
-
-unsigned int parse_num_arg (const char *arg, const char *arg_name)
-{
-	unsigned int result = 0;
-	int i;
-	char c;
-	
-	if (arg[0] == '\0') {
-		ParodusError ("Empty %s argument\n", arg_name);
-		return (unsigned int) -1;
-	}
-	for (i=0; '\0' != (c=arg[i]); i++)
-	{
-		if ((c<'0') || (c>'9')) {
-			ParodusError ("Non-numeric %s argument\n", arg_name);
-			return (unsigned int) -1;
-		}
-		result = (result*10) + c - '0';
-	}
-	return result;
-}
-
-int parse_webpa_url (const char *full_url, 
-	char **server_addr, unsigned int *port)
-{
-  int allow_insecure;
-  unsigned int port_val;
-  int buflen = strlen (full_url) + 1;
-  char *url_buf = NULL;
-  char port_buf[8];
-
-#define ERROR__(msg) \
-  ParodusError (msg); \
-  if (NULL != url_buf) \
-    free (url_buf);
-
-  *server_addr = NULL;
-     
-  url_buf = (char *) malloc (buflen);
-  if (NULL == url_buf) {
-    ERROR__ ("parse_webpa_url allocatio n failed.\n")
-    return -1;
-  }
-  allow_insecure = parse_webpa_url__ (full_url,
-	url_buf, buflen, port_buf, 8);
-  if (allow_insecure < 0) {
-    ERROR__ ("parse_webpa_url invalid url\n")
-    return -1;
-  }
-  port_val = parse_num_arg (port_buf, "server port");
-  if (port_val == (unsigned int) -1) {
-    ERROR__ ("Invalid port in server url")
-    return -1;
-  }
-  if ((port_val == 0) || (port_val > 65535)) {
-    ERROR__ ("port value out of range in server url")
-    return -1;
-  }
-  *server_addr = url_buf;
-  *port = port_val;	
-  return allow_insecure;
-#undef ERROR__
-}
-
-
-int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
-{
-    static const struct option long_options[] = {
-        {"hw-model",                required_argument, 0, 'm'},
-        {"hw-serial-number",        required_argument, 0, 's'},
-        {"hw-manufacturer",         required_argument, 0, 'f'},
-        {"hw-mac",                  required_argument, 0, 'd'},
-        {"hw-last-reboot-reason",   required_argument, 0, 'r'},
-        {"fw-name",                 required_argument, 0, 'n'},
-        {"boot-time",               required_argument, 0, 'b'},
-        {"webpa-url",               required_argument, 0, 'u'},
-        {"webpa-ping-timeout",      required_argument, 0, 't'},
-        {"webpa-backoff-max",       required_argument, 0, 'o'},
-        {"webpa-interface-used",    required_argument, 0, 'i'},
-        {"parodus-local-url",       required_argument, 0, 'l'},
-        {"partner-id",              required_argument, 0, 'p'},
-#ifdef ENABLE_SESHAT
-        {"seshat-url",              required_argument, 0, 'e'},
-#endif
-        {"dns-txt-url",             required_argument, 0, 'D'},
-        {"acquire-jwt",				required_argument, 0, 'j'},
-        {"jwt-algo",                required_argument, 0, 'a'},
-        {"jwt-public-key-file",     required_argument, 0, 'k'},
-        {"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'},
-	{"token-acquisition-script",     required_argument, 0, 'J'},
-	{"crud-config-file",        required_argument, 0, 'C'},
-        {0, 0, 0, 0}
-    };
    int c;
-    ParodusInfo("Parsing parodus command line arguments..\n");

-	if (NULL == cfg) {
-		ParodusError ("NULL cfg structure\n");
-		return -1;
-	} 
-	cfg->flags = 0;
-	parStrncpy (cfg->webpa_url, "", sizeof(cfg->webpa_url));
-	cfg->acquire_jwt = 0;
-	cfg->jwt_algo = 0;
-	parStrncpy (cfg->jwt_key, "", sizeof(cfg->jwt_key));
-	cfg->crud_config_file = NULL;
-	cfg->cloud_status = NULL;
-	cfg->cloud_disconnect = NULL;
-	optind = 1;  /* We need this if parseCommandLine is called again */
    while (1)
    {
-
+      static struct option long_options[] = {
+          {"hw-model",     required_argument,   0, 'm'},
+          {"hw-serial-number",  required_argument,  0, 's'},
+          {"hw-manufacturer",  required_argument, 0, 'f'},
+          {"hw-mac",  required_argument, 0, 'd'},
+          {"hw-last-reboot-reason",  required_argument, 0, 'r'},
+          {"fw-name",  required_argument, 0, 'n'},
+          {"boot-time",  required_argument, 0, 'b'},
+          {"webpa-url",  required_argument, 0, 'u'},
+          {"webpa-ping-timeout",    required_argument, 0, 't'},
+          {"webpa-backoff-max",  required_argument, 0, 'o'},
+          {"webpa-inteface-used",    required_argument, 0, 'i'},
+          {"parodus-local-url",  required_argument, 0, 'l'},
+          {"partner-id",  required_argument, 0, 'p'},
+	  {"seshat-url", required_argument, 0, 'e'},
+          {0, 0, 0, 0}
+        };
      /* 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",
-				long_options, &option_index);
+      c = getopt_long (argc, argv, "m:s:f:d:r:n:b:u:t:o:i:l:p:e:",long_options, &option_index);

      /* Detect the end of the options. */
      if (c == -1)
@@ -438,19 +78,15 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
          break;

        case 'd':
-					if (parse_mac_address (cfg->hw_mac, optarg) == 0) {
-            ParodusInfo ("hw_mac is %s\n",cfg->hw_mac);
-					} else {
-						ParodusError ("Bad mac address %s\n", optarg);
-						return -1;
-					}
+           parStrncpy(cfg->hw_mac, optarg,sizeof(cfg->hw_mac));
+           ParodusInfo("hw_mac is %s\n",cfg->hw_mac);
          break;
-#ifdef ENABLE_SESHAT
+
         case 'e':
           parStrncpy(cfg->seshat_url, optarg,sizeof(cfg->seshat_url));
           ParodusInfo("seshat_url is %s\n",cfg->seshat_url);
          break;
-#endif
+ 
        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);
@@ -462,136 +98,50 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
          break;

        case 'b':
-          cfg->boot_time = parse_num_arg (optarg, "boot-time");
+          cfg->boot_time = atoi(optarg);
          ParodusInfo("boot_time is %d\n",cfg->boot_time);
          break;
       
         case 'u':
-			parStrncpy(cfg->webpa_url, optarg,sizeof(cfg->webpa_url));
-			if (server_is_http (cfg->webpa_url, NULL) < 0) {
-				ParodusError ("Bad webpa url %s\n", optarg);
-				return -1;
-			}
+          parStrncpy(cfg->webpa_url, optarg,sizeof(cfg->webpa_url));
          ParodusInfo("webpa_url is %s\n",cfg->webpa_url);
          break;
        
        case 't':
-          cfg->webpa_ping_timeout = parse_num_arg (optarg, "webpa-ping-timeout");
-          if (cfg->webpa_ping_timeout == (unsigned int) -1)
-			return -1;
+          cfg->webpa_ping_timeout = atoi(optarg);
          ParodusInfo("webpa_ping_timeout is %d\n",cfg->webpa_ping_timeout);
          break;

        case 'o':
-          cfg->webpa_backoff_max = parse_num_arg (optarg, "webpa-backoff-max");
-          if (cfg->webpa_backoff_max == (unsigned int) -1)
-			return -1;
+          cfg->webpa_backoff_max = atoi(optarg);
          ParodusInfo("webpa_backoff_max is %d\n",cfg->webpa_backoff_max);
          break;

        case 'i':
          parStrncpy(cfg->webpa_interface_used, optarg,sizeof(cfg->webpa_interface_used));
-          ParodusInfo("webpa_interface_used is %s\n",cfg->webpa_interface_used);
+          ParodusInfo("webpa_inteface_used is %s\n",cfg->webpa_interface_used);
          break;
          
        case 'l':
          parStrncpy(cfg->local_url, optarg,sizeof(cfg->local_url));
          ParodusInfo("parodus local_url is %s\n",cfg->local_url);
-          break;
-        case 'D':
-          // like 'fabric' or 'test'
-          // this parameter is used, along with the hw_mac parameter
-          // to create the dns txt record id
-          parStrncpy(cfg->dns_txt_url, optarg,sizeof(cfg->dns_txt_url));
-          ParodusInfo("parodus dns-txt-url is %s\n",cfg->dns_txt_url);
-          break;
-		 
-        case 'j':
-          cfg->acquire_jwt = parse_num_arg (optarg, "acquire-jwt");
-          if (cfg->acquire_jwt == (unsigned int) -1)
-			return -1;
-          ParodusInfo("acquire jwt option is %d\n",cfg->acquire_jwt);
          break;

-		case 'a':
-			// the command line argument is a list of allowed algoritms,
-			// separated by colons, like "RS256:RS512:none"
-			cfg->jwt_algo = get_algo_mask (optarg);
-			if (cfg->jwt_algo == (unsigned int) -1) {
-			  return -1;
-			}
-          ParodusInfo("jwt_algo is %u\n",cfg->jwt_algo);
-          break;
-		case 'k':
-          read_key_from_file (optarg, cfg->jwt_key, sizeof(cfg->jwt_key));
-          ParodusInfo("jwt_key is %s\n",cfg->jwt_key);
-          break;
        case 'p':
          parStrncpy(cfg->partner_id, optarg,sizeof(cfg->partner_id));
          ParodusInfo("partner_id is %s\n",cfg->partner_id);
          break;

-        case 'c':
-          parStrncpy(cfg->cert_path, optarg,sizeof(cfg->cert_path));
-          ParodusInfo("cert_path is %s\n",cfg->cert_path);
-          break;
-
-        case '4':
-          ParodusInfo("Force IPv4\n");
-          cfg->flags |= FLAGS_IPV4_ONLY;
-          break;
-
-        case '6':
-          ParodusInfo("Force IPv6\n");
-          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 '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. */
          break;

        default:
           ParodusError("Enter Valid commands..\n");
-		   return -1;
+          abort ();
        }
    }

-	if (0 == strlen (cfg->webpa_url)) {
-		ParodusError ("Missing webpa url argument\n");
-		return -1;
-	}
-
-    if (cfg->acquire_jwt) {
-		if (0 == cfg->jwt_algo) {
-			ParodusError ("Missing jwt algorithm argument\n");
-			return -1;
-		}
-		if ((0 != (cfg->jwt_algo & rsa_algorithms)) &&
-		    (0 == strlen (cfg->jwt_key)) ) {
-			ParodusError ("Missing jwt public key file argument\n");
-			return -1;
-		}
-		    
-	}
-	
    ParodusPrint("argc is :%d\n", argc);
    ParodusPrint("optind is :%d\n", optind);

@@ -603,100 +153,6 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
        ParodusPrint ("%s ", argv[optind++]);
      putchar ('\n');
    }
-    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'};
-	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'} ;
-	
-	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)
-    {
-        ParodusError("cfg is NULL\n");
-        return;
-    }
-    
-    ParodusInfo("Setting default values to parodusCfg\n");
-    parStrncpy(cfg->local_url, PARODUS_UPSTREAM, sizeof(cfg->local_url));
-
-	cfg->acquire_jwt = 0;
-
-    parStrncpy(cfg->dns_txt_url, DNS_TXT_URL, sizeof(cfg->dns_txt_url));
-
-    parStrncpy(cfg->jwt_key, "\0", sizeof(cfg->jwt_key));
-    
-    cfg->jwt_algo = 0;
-   
-    parStrncpy(cfg->cert_path, "\0", sizeof(cfg->cert_path));
-
-    cfg->flags = 0;
-    
-    parStrncpy(cfg->webpa_path_url, WEBPA_PATH_URL,sizeof(cfg->webpa_path_url));
-    
-    snprintf(cfg->webpa_protocol, sizeof(cfg->webpa_protocol), "%s-%s", PROTOCOL_VALUE, GIT_COMMIT_TAG);
-    ParodusInfo(" cfg->webpa_protocol is %s\n", cfg->webpa_protocol);
-    
-    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->cloud_status = CLOUD_STATUS_OFFLINE;
-	ParodusInfo("Default cloud_status is %s\n", cfg->cloud_status);
 }

 void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg)
@@ -707,168 +163,99 @@ void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg)
        return;
    }
    
-    if(strlen (config->hw_model) !=0)
+    ParodusCfg *pConfig =config;
+    
+    if(strlen (pConfig->hw_model) !=0)
    {
-          parStrncpy(cfg->hw_model, config->hw_model, sizeof(cfg->hw_model));
+        strncpy(cfg->hw_model, pConfig->hw_model,strlen(pConfig->hw_model)+1);
    }
    else
    {
        ParodusPrint("hw_model is NULL. read from tmp file\n");
    }
-    if( strlen(config->hw_serial_number) !=0)
+    if( strlen(pConfig->hw_serial_number) !=0)
    {
-        parStrncpy(cfg->hw_serial_number, config->hw_serial_number, sizeof(cfg->hw_serial_number));
+        strncpy(cfg->hw_serial_number, pConfig->hw_serial_number,strlen(pConfig->hw_serial_number)+1);
    }
    else
    {
        ParodusPrint("hw_serial_number is NULL. read from tmp file\n");
    }
-    if(strlen(config->hw_manufacturer) !=0)
+    if(strlen(pConfig->hw_manufacturer) !=0)
    {
-        parStrncpy(cfg->hw_manufacturer, config->hw_manufacturer,sizeof(cfg->hw_manufacturer));
+        strncpy(cfg->hw_manufacturer, pConfig->hw_manufacturer,strlen(pConfig->hw_manufacturer)+1);
    }
    else
    {
        ParodusPrint("hw_manufacturer is NULL. read from tmp file\n");
    }
-    if(strlen(config->hw_mac) !=0)
+    if(strlen(pConfig->hw_mac) !=0)
    {
-       parStrncpy(cfg->hw_mac, config->hw_mac,sizeof(cfg->hw_mac));
+       strncpy(cfg->hw_mac, pConfig->hw_mac,strlen(pConfig->hw_mac)+1);
    }
    else
    {
        ParodusPrint("hw_mac is NULL. read from tmp file\n");
    }
-    if(strlen (config->hw_last_reboot_reason) !=0)
+    if(strlen (pConfig->hw_last_reboot_reason) !=0)
    {
-         parStrncpy(cfg->hw_last_reboot_reason, config->hw_last_reboot_reason,sizeof(cfg->hw_last_reboot_reason));
+         strncpy(cfg->hw_last_reboot_reason, pConfig->hw_last_reboot_reason,strlen(pConfig->hw_last_reboot_reason)+1);
    }
    else
    {
        ParodusPrint("hw_last_reboot_reason is NULL. read from tmp file\n");
    }
-    if(strlen(config->fw_name) !=0)
+    if(strlen(pConfig->fw_name) !=0)
    {   
-        parStrncpy(cfg->fw_name, config->fw_name,sizeof(cfg->fw_name));
+        strncpy(cfg->fw_name, pConfig->fw_name,strlen(pConfig->fw_name)+1);
    }
    else
    {
        ParodusPrint("fw_name is NULL. read from tmp file\n");
    }
-    if( strlen(config->webpa_url) !=0)
+    if( strlen(pConfig->webpa_url) !=0)
    {
-        parStrncpy(cfg->webpa_url, config->webpa_url,sizeof(cfg->webpa_url));
+        strncpy(cfg->webpa_url, pConfig->webpa_url,strlen(pConfig->webpa_url)+1);
    }
    else
    {
        ParodusPrint("webpa_url is NULL. read from tmp file\n");
    }
-    if(strlen(config->webpa_interface_used )!=0)
+    if(strlen(pConfig->webpa_interface_used )!=0)
    {
-        parStrncpy(cfg->webpa_interface_used, config->webpa_interface_used,sizeof(cfg->webpa_interface_used));
+        strncpy(cfg->webpa_interface_used, pConfig->webpa_interface_used,strlen(pConfig->webpa_interface_used)+1);
    }
    else
    {
        ParodusPrint("webpa_interface_used is NULL. read from tmp file\n");
    }
-    if( strlen(config->local_url) !=0)
+    if( strlen(pConfig->local_url) !=0)
    {
-        parStrncpy(cfg->local_url, config->local_url,sizeof(cfg->local_url));
+        strncpy(cfg->local_url, pConfig->local_url,strlen(pConfig->local_url)+1);
    }
    else
    {
 		ParodusInfo("parodus local_url is NULL. adding default url\n");
-		parStrncpy(cfg->local_url, PARODUS_UPSTREAM, sizeof(cfg->local_url));
+		strncpy(cfg->local_url, PARODUS_UPSTREAM, strlen(PARODUS_UPSTREAM)+1);
        
    }

-    if( strlen(config->partner_id) !=0)
+    if( strlen(pConfig->partner_id) !=0)
    {
-        parStrncpy(cfg->partner_id, config->partner_id,sizeof(cfg->partner_id));
+        strncpy(cfg->partner_id, pConfig->partner_id,strlen(pConfig->partner_id)+1);
    }
    else
    {
 		ParodusPrint("partner_id is NULL. read from tmp file\n");
    }
-#ifdef ENABLE_SESHAT
-    if( strlen(config->seshat_url) !=0)
-    {
-        parStrncpy(cfg->seshat_url, config->seshat_url,sizeof(cfg->seshat_url));
-    }
-    else
-    {
-        ParodusInfo("seshat_url is NULL. Read from tmp file\n");
-    }
-#endif
-	cfg->acquire_jwt = config->acquire_jwt;
-
-     if( strlen(config->dns_txt_url) !=0)
-    {
-        parStrncpy(cfg->dns_txt_url, config->dns_txt_url, sizeof(cfg->dns_txt_url));
-    }
-    else
-    {
-	ParodusInfo("parodus dns-txt-url is NULL. adding default\n");
-	parStrncpy(cfg->dns_txt_url, DNS_TXT_URL, sizeof(cfg->dns_txt_url));
-    }
-
-    if(strlen(config->jwt_key )!=0)
-    {
-        parStrncpy(cfg->jwt_key, config->jwt_key,sizeof(cfg->jwt_key));
-    }
-    else
-    {
-        parStrncpy(cfg->jwt_key, "\0", sizeof(cfg->jwt_key));
-        ParodusPrint("jwt_key is NULL. set to empty\n");
-    }
-
-	cfg->jwt_algo = config->jwt_algo;        
-
-    if(strlen(config->cert_path )!=0)
-    {
-        parStrncpy(cfg->cert_path, config->cert_path,sizeof(cfg->cert_path));
-    }
-    else
-    {
-        parStrncpy(cfg->cert_path, "\0", sizeof(cfg->cert_path));
-        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;
-    parStrncpy(cfg->webpa_path_url, WEBPA_PATH_URL,sizeof(cfg->webpa_path_url));
-    snprintf(cfg->webpa_protocol, sizeof(cfg->webpa_protocol), "%s-%s", PROTOCOL_VALUE, GIT_COMMIT_TAG);
-    ParodusInfo("cfg->webpa_protocol is %s\n", cfg->webpa_protocol);
-    parStrncpy(cfg->webpa_uuid, "1234567-345456546",sizeof(cfg->webpa_uuid));
+    cfg->boot_time = pConfig->boot_time;
+    cfg->secureFlag = 1;
+    cfg->webpa_ping_timeout = pConfig->webpa_ping_timeout;
+    cfg->webpa_backoff_max = pConfig->webpa_backoff_max;
+    strncpy(cfg->webpa_path_url, WEBPA_PATH_URL, strlen(WEBPA_PATH_URL)+1);
+    strncpy(cfg->webpa_protocol, WEBPA_PROTOCOL_VALUE, strlen(WEBPA_PROTOCOL_VALUE)+1);
+    strncpy(cfg->webpa_uuid, "1234567-345456546", strlen("1234567-345456546")+1);
    ParodusPrint("cfg->webpa_uuid is :%s\n", cfg->webpa_uuid);
    
-    if(config->crud_config_file != NULL)
-    {
-        cfg->crud_config_file = strdup(config->crud_config_file);
-    }
-    else
-    {
-        ParodusPrint("crud_config_file is NULL. set to empty\n");
-    }
 }
-
-
--- a/src/config.h
+++ b/src/config.h
@@ -1,24 +1,9 @@
-/**
- * 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 config.h
 *
 * @description This file contains configuration details of parodus
 *
+ * Copyright (c) 2015  Comcast
 */
 
 #ifndef _CONFIG_H_ 
@@ -33,37 +18,25 @@ extern "C" {
 /*----------------------------------------------------------------------------*/

 /* WRP CRUD Model Macros */
-#define HW_MODELNAME            "hw-model"
-#define HW_SERIALNUMBER         "hw-serial-number"
-#define HW_MANUFACTURER         "hw-manufacturer"
-#define HW_DEVICEMAC            "hw-mac"
-#define HW_LAST_REBOOT_REASON   "hw-last-reboot-reason"
-#define FIRMWARE_NAME           "fw-name"
-#define BOOT_TIME               "boot-time"
-#define LAST_RECONNECT_REASON   "webpa-last-reconnect-reason"
-#define WEBPA_PROTOCOL          "webpa-protocol"
-#define WEBPA_INTERFACE         "webpa-interface-used"
-#define WEBPA_UUID              "webpa-uuid"
-#define WEBPA_URL               "webpa-url"
-#define WEBPA_PING_TIMEOUT      "webpa-ping-timeout"
-#define WEBPA_BACKOFF_MAX       "webpa-backoff-max"
-#define PARTNER_ID              "partner-id"
-#define CERT_PATH               "ssl-cert-path"
-#define CLOUD_STATUS            "cloud-status"
-#define CLOUD_DISCONNECT        "cloud-disconnect"
-#define CLOUD_STATUS_ONLINE     "online"
-#define CLOUD_STATUS_OFFLINE    "offline"
-#define CLOUD_DISCONNECT_REASON "disconnection-reason"
-#define BOOT_RETRY_WAIT         "boot-time-retry-wait"
+#define HW_MODELNAME                                	"hw-model"
+#define HW_SERIALNUMBER                                 "hw-serial-number"
+#define HW_MANUFACTURER                                 "hw-manufacturer"
+#define HW_DEVICEMAC                                  	"hw-mac"
+#define HW_LAST_REBOOT_REASON                           "hw-last-reboot-reason"
+#define FIRMWARE_NAME                                  	"fw-name"
+#define BOOT_TIME                                  	"boot-time"
+#define LAST_RECONNECT_REASON                           "webpa-last-reconnect-reason"
+#define WEBPA_PROTOCOL                                  "webpa-protocol"
+#define WEBPA_INTERFACE                                 "webpa-inteface-used"
+#define WEBPA_UUID                                      "webpa-uuid"
+#define WEBPA_URL                                       "webpa-url"
+#define WEBPA_PING_TIMEOUT                              "webpa-ping-timeout"
+#define WEBPA_BACKOFF_MAX                               "webpa-backoff-max"
+#define PARTNER_ID                                      "partner-id"

-#define PROTOCOL_VALUE 					"PARODUS-2.0"
-#define WEBPA_PATH_URL                  "/api/v2/device"
-#define JWT_ALGORITHM					"jwt-algo"
-#define	JWT_KEY						"jwt-key"
-#define DNS_TXT_URL	"fabric"
-#define PARODUS_UPSTREAM                "tcp://127.0.0.1:6666"
-
-#define ALLOW_NON_RSA_ALG	false
+#define WEBPA_PROTOCOL_VALUE 				"WebPA-1.6"
+#define WEBPA_PATH_URL                                    "/api/v2/device"
+#define PARODUS_UPSTREAM                		"tcp://127.0.0.1:6666"

 /*----------------------------------------------------------------------------*/
 /*                               Data Structures                              */
@@ -83,72 +56,25 @@ typedef struct
    char webpa_path_url[124];
    unsigned int webpa_backoff_max;
    char webpa_interface_used[16];
-    char webpa_protocol[32];
+    char webpa_protocol[16];
    char webpa_uuid[64];
-    unsigned int flags;
+    unsigned int secureFlag;
    char local_url[124];
    char partner_id[64];
-#ifdef ENABLE_SESHAT
    char seshat_url[128];
-#endif
-    char dns_txt_url[64];
-    unsigned int acquire_jwt;
-    unsigned int jwt_algo;  // bit mask set for each allowed algorithm
-    char jwt_key[4096]; // may be read in from a pem file
-    char cert_path[64];
-    char webpa_auth_token[4096];
-    char token_acquisition_script[64];
-    char token_read_script[64];
-	char *crud_config_file;
-	char *cloud_status;
-	char *cloud_disconnect;
-	unsigned int boot_retry_wait;
 } ParodusCfg;

-#define FLAGS_IPV6_ONLY (1 << 0)
-#define FLAGS_IPV4_ONLY (1 << 1)
-#define FLAGS_IPV6_IPV4 (FLAGS_IPV6_ONLY | FLAGS_IPV4_ONLY)
-
 /*----------------------------------------------------------------------------*/
 /*                             Function Prototypes                            */
 /*----------------------------------------------------------------------------*/

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

-/**
- * parse command line arguments and create config structure
- * and return whether args are valid or not
- *
- * @param argc	number of command line arguments
- * @param argv	command line argument lis
- * @return 0 if OK
-*    or -1 if error
-*/ 
-int parseCommandLine(int argc,char **argv,ParodusCfg * cfg);
+void 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 *);
-char *get_token_application(void) ;
-void set_cloud_disconnect_reason(ParodusCfg *cfg, char *disconn_reason);
-void reset_cloud_disconnect_reason(ParodusCfg *cfg);
-/**
- * parse a webpa url. Extract the server address, the port
- * and return whether it's secure or not
- *
- * @param full_url	full url
- * @param server_addr	ptr to a server address ptr
- *                      will be NULL if invalid,
- *                      otherwise will need to be freed
- * @param port 		ptr to port variable
- * @return 1 if insecure connection is allowed, 0 if not,
-*    or -1 if error
-*/ 
-int parse_webpa_url (const char *full_url, 
-	char **server_addr, unsigned int *port);

 #ifdef __cplusplus
 }
--- a/src/conn_interface.c
+++ b/src/conn_interface.c
@@ -1,24 +1,9 @@
-/**
- * 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 conn_interface.c
 *
 * @description This decribes interface to create WebSocket client connections.
 *
+ * Copyright (c) 2015  Comcast
 */
 
 #include "connection.h"
@@ -32,55 +17,35 @@
 #include "mutex.h"
 #include "spin_thread.h"
 #include "service_alive.h"
-#include "seshat_interface.h"
-#include "crud_interface.h"
-#include "heartBeat.h"
-#include "close_retry.h"
-#ifdef FEATURE_DNS_QUERY
-#include <ucresolv_log.h>
-#endif
-#include <time.h>
+#include <libseshat.h>

 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */
 /*----------------------------------------------------------------------------*/

 #define HEARTBEAT_RETRY_SEC                         	30      /* Heartbeat (ping/pong) timeout in seconds */
-#define CLOUD_RECONNECT_TIME                       		5		/* Cloud disconnect max time in minutes */

 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
-bool g_shutdown  = false;
-pthread_t upstream_tid;
-pthread_t upstream_msg_tid;
-pthread_t downstream_tid;
-pthread_t svc_alive_tid;
-pthread_t crud_tid;

-/*----------------------------------------------------------------------------*/
-/*                             Function Prototypes                            */
-/*----------------------------------------------------------------------------*/
-void timespec_diff(struct timespec *start, struct timespec *stop,
-                   struct timespec *result);
+bool close_retry = false;
+bool LastReasonStatus = false;
+volatile unsigned int heartBeatTimer = 0;
+pthread_mutex_t close_mut=PTHREAD_MUTEX_INITIALIZER;

 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/

-void createSocketConnection(void (* initKeypress)())
+void createSocketConnection(void *config_in, void (* initKeypress)())
 {
-    //ParodusCfg *tmpCfg = (ParodusCfg*)config_in;
+    int intTimer=0;	
+    ParodusCfg *tmpCfg = (ParodusCfg*)config_in;
    noPollCtx *ctx;
-    bool seshat_registered = false;
-    unsigned int webpa_ping_timeout_ms = 1000 * get_parodus_cfg()->webpa_ping_timeout;
-    unsigned int heartBeatTimer = 0;
-    struct timespec start_svc_alive_timer;
+    bool seshat_started;
    
-    //loadParodusCfg(tmpCfg,get_parodus_cfg());
-#ifdef FEATURE_DNS_QUERY
-	register_ucresolv_logger (__cimplog);
-#endif
+    loadParodusCfg(tmpCfg,get_parodus_cfg());
    ParodusPrint("Configure nopoll thread handlers in Parodus\n");
    nopoll_thread_handlers(&createMutex, &destroyMutex, &lockMutex, &unlockMutex);
    ctx = nopoll_ctx_new();
@@ -93,121 +58,75 @@ void createSocketConnection(void (* initKeypress)())
    nopoll_log_set_handler (ctx, __report_log, NULL);
    #endif

-    if(!createNopollConnection(ctx))
-    {
-		ParodusError("Unrecovered error, terminating the process\n");
-		abort();
-    }
+    createNopollConnection(ctx);
    packMetaData();
    
    UpStreamMsgQ = NULL;
-    StartThread(handle_upstream, &upstream_tid);
-    StartThread(processUpstreamMessage, &upstream_msg_tid);
+    StartThread(handle_upstream);
+    StartThread(processUpstreamMessage);
    ParodusMsgQ = NULL;
-    StartThread(messageHandlerTask, &downstream_tid);
-    StartThread(serviceAliveTask, &svc_alive_tid);
-    StartThread(CRUDHandlerTask, &crud_tid);
+    StartThread(messageHandlerTask);
+    StartThread(serviceAliveTask);

    if (NULL != initKeypress) 
    {
        (* initKeypress) ();
    }

-    seshat_registered = __registerWithSeshat();
+        /* Start seshat lib interface */
+    seshat_started = (0 == init_lib_seshat(get_parodus_cfg()->seshat_url));
+    if (false == seshat_started) {
+        ParodusPrint("init_lib_seshat() Failed, seshatlib not available!\n");
+    } else {
+        ParodusPrint("init_lib_seshat() seshatlib initialized! (url %s)\n",
+	            get_parodus_cfg()->seshat_url);           
+    } 
    
-    clock_gettime(CLOCK_REALTIME, &start_svc_alive_timer);
-
    do
    {
-        struct timespec start, stop, diff;
-        int time_taken_ms;
-
-        clock_gettime(CLOCK_REALTIME, &start);
        nopoll_loop_wait(ctx, 5000000);
-        clock_gettime(CLOCK_REALTIME, &stop);
+        intTimer = intTimer + 5;

-        timespec_diff(&start, &stop, &diff);
-        time_taken_ms = diff.tv_sec * 1000 + (diff.tv_nsec / 1000000);
-
-        // ParodusInfo("nopoll_loop_wait() time %d msec\n", time_taken_ms);
-	heartBeatTimer = get_heartBeatTimer();
-        if(heartBeatTimer >= webpa_ping_timeout_ms)
+        if(heartBeatTimer >= get_parodus_cfg()->webpa_ping_timeout) 
        {
-            ParodusInfo("heartBeatTimer %d webpa_ping_timeout_ms %d\n", heartBeatTimer, webpa_ping_timeout_ms);
-
-            if(!get_close_retry())
+            if(!close_retry) 
            {
-                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");
+                ParodusError("ping wait time > %d. Terminating the connection with WebPA server and retrying\n", get_parodus_cfg()->webpa_ping_timeout);
                set_global_reconnect_reason("Ping_Miss");
-                set_global_reconnect_status(true);
-                set_close_retry();
+                LastReasonStatus = true;
+                pthread_mutex_lock (&close_mut);
+                close_retry = true;
+                pthread_mutex_unlock (&close_mut);
            }
            else
-            {
-				ParodusPrint("heartBeatHandler - close_retry set to %d, hence resetting the heartBeatTimer\n",get_close_retry());
+            {			
+                ParodusPrint("heartBeatHandler - close_retry set to %d, hence resetting the heartBeatTimer\n",close_retry);
            }
-            reset_heartBeatTimer();
+            heartBeatTimer = 0;
        }
-        else {
-            increment_heartBeatTimer(time_taken_ms);
-        }
-
-        if( false == seshat_registered ) {
-            seshat_registered = __registerWithSeshat();
-        }
-
-        if(get_close_retry())
+        else if(intTimer >= 30)
        {
-            ParodusInfo("close_retry is %d, hence closing the connection and retrying\n", get_close_retry());
+            ParodusPrint("heartBeatTimer %d\n",heartBeatTimer);
+            heartBeatTimer += HEARTBEAT_RETRY_SEC;	
+            intTimer = 0;		
+        }
+
+        if(close_retry)
+        {
+            ParodusInfo("close_retry is %d, hence closing the connection and retrying\n", close_retry);
            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);
-		set_cloud_disconnect_time(CLOUD_RECONNECT_TIME);
-		ParodusInfo("Waiting for %d minutes for reconnecting .. \n", get_cloud_disconnect_time());
-
-		sleep (get_cloud_disconnect_time() * 60);
-		ParodusInfo("cloud-disconnect reason reset after %d minutes\n", get_cloud_disconnect_time());
-		free(get_parodus_cfg()->cloud_disconnect);
-		reset_cloud_disconnect_reason(get_parodus_cfg());
-            }
            createNopollConnection(ctx);
-        }
-       } while(!get_close_retry() && !g_shutdown);
-
-    pthread_mutex_lock (get_global_svc_mut());
-    pthread_cond_signal (get_global_svc_con());
-    pthread_mutex_unlock (get_global_svc_mut());
-    pthread_mutex_lock (get_global_crud_mut());
-    pthread_cond_signal (get_global_crud_con());
-    pthread_mutex_unlock (get_global_crud_mut());
-    pthread_mutex_lock (&g_mutex);
-    pthread_cond_signal (&g_cond);
-    pthread_mutex_unlock (&g_mutex);
-    pthread_mutex_lock (get_global_nano_mut ());
-    pthread_cond_signal (get_global_nano_con());
-    pthread_mutex_unlock (get_global_nano_mut());
-
-    ParodusInfo ("joining threads\n");
-    JoinThread (svc_alive_tid);
-    JoinThread (upstream_tid);
-    JoinThread (downstream_tid);
-    JoinThread (upstream_msg_tid);
-    JoinThread (crud_tid);
-
-    deleteAllClients ();
+        }		
+    } while(!close_retry);

    close_and_unref_connection(get_global_conn());
    nopoll_ctx_unref(ctx);
    nopoll_cleanup_library();
-}
-
-void shutdownSocketConnection(void) {
-   g_shutdown = true;
+
+    if (seshat_started) {
+	    shutdown_seshat_lib();
+    }
+    
 }

--- a/src/conn_interface.h
+++ b/src/conn_interface.h
@@ -1,25 +1,11 @@
-/**
- * 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 conn_interface.h
 *
 * @description This header defines interface to create WebSocket client connections.
 *
+ * Copyright (c) 2015  Comcast
 */
+ 
 #ifndef _CONN_INTERFACE_H_
 #define _CONN_INTERFACE_H_

@@ -44,8 +30,7 @@ extern UpStreamMsg *UpStreamMsgQ;
 * Loads the WebPA config file, if not provided by the caller,
 *  and creates the intial connection and manages the connection wait, close mechanisms.
 */
-void createSocketConnection(void (* initKeypress)());
-void shutdownSocketConnection(void);
+void createSocketConnection(void *config_in, void (* initKeypress)());
   
 #ifdef __cplusplus
 }
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,59 +1,38 @@
-/**
- * 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 connection.c
 *
 * @description This decribes functions required to manage WebSocket client connections.
 *
+ * Copyright (c) 2015  Comcast
 */
 
 #include "connection.h"
 #include "time.h"
-#include "token.h"
 #include "config.h"
 #include "nopoll_helpers.h"
 #include "mutex.h"
 #include "spin_thread.h"
-#include "ParodusInternal.h"
-#include "heartBeat.h"
-#include "close_retry.h"
+
 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */
 /*----------------------------------------------------------------------------*/

-#define HTTP_CUSTOM_HEADER_COUNT                    	5
-#define INITIAL_CJWT_RETRY                    	-2
+#define HTTP_CUSTOM_HEADER_COUNT                    	4

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

+char deviceMAC[32]={'\0'};
 static char *reconnect_reason = "webpa_process_starts";
-static int cloud_disconnect_max_time = 5;
 static noPollConn *g_conn = NULL;
-static bool LastReasonStatus = false;
-static int init = 1;
-static noPollConnOpts * createConnOpts (char * extra_headers, bool secure);
-static char* build_extra_headers( const char *auth, const char *device_id,
-                                  const char *user_agent, const char *convey );
+static noPollConnOpts * createConnOpts ();
+static noPollConn * nopoll_tls_common_conn (noPollCtx  * ctx,char * serverAddr,char *serverPort);

 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
+
 noPollConn *get_global_conn(void)
 {
    return g_conn;
@@ -74,504 +53,143 @@ void set_global_reconnect_reason(char *reason)
    reconnect_reason = reason;
 }

-bool get_global_reconnect_status()
-{
-    return LastReasonStatus;
-}
-
-void set_global_reconnect_status(bool status)
-{
-    LastReasonStatus = status;
-}
-
-int get_cloud_disconnect_time()
-{
-   return cloud_disconnect_max_time;
-}
-
-void set_cloud_disconnect_time(int disconnTime)
-{
-    cloud_disconnect_max_time = disconnTime;
-}
-
-
-//--------------------------------------------------------------------
-// createNopollConnection_logic:
-
-// call stack:
-
-//  createNopollConnection
-//    find_servers
-//    keep_trying_connect     // keep trying till success or need to requery dns
-//      connect_and_wait      // tries both ipv6 and ipv4, if necessary
-//        nopoll_connect
-//        wait_connection_ready
-
-
-//--------------------------------------------------------------------
-
-#define FREE_PTR_VAR(ptr_var) \
-  if (NULL != ptr_var) { \
-    free(ptr_var); \
-    ptr_var = NULL; \
-  }
-
-void set_server_null (server_t *server)
-{
-  server->server_addr = NULL;
-}
-
-void set_server_list_null (server_list_t *server_list)
-{
-  set_server_null (&server_list->defaults);
-  set_server_null (&server_list->jwt);
-  set_server_null (&server_list->redirect);
-}
-
-int server_is_null (server_t *server)
-{
-  return (NULL == server->server_addr);
-}
-
-void free_server (server_t *server)
-{
-  FREE_PTR_VAR (server->server_addr)
-}
-
-void free_server_list (server_list_t *server_list)
-{
-  free_server (&server_list->redirect);
-  free_server (&server_list->jwt);
-  free_server (&server_list->defaults);
-}
-
-
-// If there's a redirect server, that's it,
-// else if there's a jwt server that's it,
-// else it's the default server
-
-server_t *get_current_server (server_list_t *server_list)
-{
-  if (!server_is_null (&server_list->redirect))
-    return &server_list->redirect;
-  if (!server_is_null (&server_list->jwt))
-    return &server_list->jwt;
-  return &server_list->defaults;
-}
-
-  
-int parse_server_url (const char *full_url, server_t *server)
-{
-  server->allow_insecure = parse_webpa_url (full_url,
-	&server->server_addr, &server->port);
-  return server->allow_insecure;
-}
-
-//--------------------------------------------------------------------
-void init_expire_timer (expire_timer_t *timer)
-{
-  timer->running = false;
-}
-
-int check_timer_expired (expire_timer_t *timer, long timeout_ms)
-{
-  long time_diff_ms;
-  
-  if (!timer->running) {
-    getCurrentTime(&timer->start_time);
-    timer->running = true;
-    ParodusInfo("First connect error occurred, initialized the connect error timer\n");
-    return false;
-  }
-  
-  getCurrentTime(&timer->end_time);
-  time_diff_ms = timeValDiff (&timer->start_time, &timer->end_time);
-  ParodusPrint("checking timeout difference:%ld\n", time_diff_ms);
-  if(time_diff_ms >= timeout_ms)
-    return true;
-  return false;
-}
-
-//--------------------------------------------------------------------
-void init_backoff_timer (backoff_timer_t *timer, int max_count)
-{
-  timer->count = 1;
-  timer->max_count = max_count;
-  timer->delay = 1;
-}
-
-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 timer->delay;
-}  
-
-static void backoff_delay (backoff_timer_t *timer)
-{
-  update_backoff_delay (timer);
-  ParodusInfo("Waiting with backoffRetryTime %d seconds\n", timer->delay);
-  sleep (timer->delay);
-}  
-
-//--------------------------------------------------------------------
-void free_header_info (header_info_t *header_info)
-{
-  FREE_PTR_VAR (header_info->user_agent)
-  FREE_PTR_VAR (header_info->device_id)
-  // Don't free header_info->conveyHeader, because it's static
-  header_info->conveyHeader = NULL;
-}
-
-void set_header_info_null (header_info_t *header_info)
-{
-  header_info->conveyHeader = NULL;
-  header_info->user_agent = NULL;
-  header_info->device_id = NULL;
-}
-
-int init_header_info (header_info_t *header_info)
-{
-  ParodusCfg *cfg = get_parodus_cfg();
-  size_t device_id_len;
-#define CFG_PARAM(param) ((0 != strlen(cfg->param)) ? cfg->param : "unknown")
-
-  const char *user_agent_format = "%s (%s; %s/%s;)";
-  char *protocol = CFG_PARAM (webpa_protocol);
-  char *fw_name = CFG_PARAM (fw_name);
-  char *hw_model = CFG_PARAM (hw_model);
-  char *hw_manufacturer = CFG_PARAM (hw_manufacturer);
-  
-  size_t user_agent_len = strlen(protocol) + strlen(fw_name) + 
-    strlen(hw_model) + strlen(hw_manufacturer) + strlen(user_agent_format)
-    + 1;
-    
-  set_header_info_null (header_info);  
-
-  header_info->user_agent = (char *) malloc (user_agent_len);
-  if (NULL == header_info->user_agent) {
-    ParodusError ("header user agent allocation failed.\n");
-    return -1;
-  }
-  
-  snprintf(header_info->user_agent, user_agent_len, user_agent_format,
-     protocol, fw_name, hw_model, hw_manufacturer);
-  device_id_len = strlen (cfg->hw_mac) + 5;
-  header_info->device_id = (char *) malloc (device_id_len);
-  if (NULL == header_info->device_id) {
-    ParodusError ("header device id allocation failed.\n");
-    FREE_PTR_VAR (header_info->user_agent)
-    return -1;
-  }
-  snprintf(header_info->device_id, device_id_len, "mac:%s", cfg->hw_mac);
-  
-  ParodusInfo("User-Agent: %s\n",header_info->user_agent);
-  header_info->conveyHeader = getWebpaConveyHeader();  // ptr to static variable returned
-  if (NULL == header_info->conveyHeader) {
-    ParodusError ("getWebpaConveyHeader error\n");
-    free_header_info (header_info);
-    return -1;
-  }
-  ParodusInfo("Device_id %s\n", header_info->device_id);
-  return 0;
-#undef CFG_PARAM
-} 
-
-char *build_extra_hdrs (header_info_t *header_info)
-// result must be freed
-{
-  char *auth_token = get_parodus_cfg()->webpa_auth_token;
-  return build_extra_headers( (0 < strlen(auth_token) ? auth_token : NULL),
-	header_info->device_id, header_info->user_agent, header_info->conveyHeader );
-}
-
-
-//--------------------------------------------------------------------
-void set_current_server (create_connection_ctx_t *ctx)
-{
-  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)
-{
-  FREE_PTR_VAR (ctx->extra_headers)
-}
-
-void free_connection_ctx (create_connection_ctx_t *ctx)
-{
-  free_extra_headers (ctx);
-  free_header_info (&ctx->header_info);
-  free_server_list (&ctx->server_list);
-}
-
-
-//--------------------------------------------------------------------
-// find_servers:
-// get and parse default server
-// if necessary, query dns and parse server from jwt
-// populate server_list
-// return values defined in ParodusInternal.h
-
-int find_servers (server_list_t *server_list)
-{
-  server_t *default_server = &server_list->defaults;
-
-  free_server_list (server_list);
-  // parse default server URL
-  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
-  if (get_parodus_cfg()->acquire_jwt) {
-    server_t *jwt_server = &server_list->jwt;
-    //query dns and validate JWT
-    jwt_server->allow_insecure = allow_insecure_conn(
-             &jwt_server->server_addr, &jwt_server->port);
-    if (jwt_server->allow_insecure < 0) {
-      return FIND_JWT_FAIL;
-    }
-    ParodusInfo("JWT ON: jwt_server_url stored as %s\n", jwt_server->server_addr);
-  }
-#endif
-  return FIND_SUCCESS;
-}
-
-
-//--------------------------------------------------------------------
-// connect to current server
-int nopoll_connect (create_connection_ctx_t *ctx, int is_ipv6)
-{
-   noPollCtx *nopoll_ctx = ctx->nopoll_ctx;
-   server_t *server = ctx->current_server;
-   noPollConn *connection;
-   noPollConnOpts * opts;
-   char *default_url = get_parodus_cfg()->webpa_path_url; 
-   char port_buf[8];
-
-   sprintf (port_buf, "%u", server->port);
-   if (server->allow_insecure > 0) {
-      ParodusPrint("secure false\n");
-      opts = createConnOpts(ctx->extra_headers, false); 
-      connection = nopoll_conn_new_opts (nopoll_ctx, opts, 
-        server->server_addr, port_buf,
-        NULL, default_url,NULL,NULL);// WEBPA-787
-   } else {
-      ParodusPrint("secure true\n");
-      opts = createConnOpts(ctx->extra_headers, true);
-      if (is_ipv6) {
-         ParodusInfo("Connecting in Ipv6 mode\n");
-         connection = nopoll_conn_tls_new6 (nopoll_ctx, opts, 
-           server->server_addr, port_buf,
-           NULL, default_url,NULL,NULL);
-      } else {      
-         ParodusInfo("Connecting in Ipv4 mode\n");
-         connection = nopoll_conn_tls_new (nopoll_ctx, opts, 
-           server->server_addr, port_buf,
-           NULL, default_url,NULL,NULL);
-      }      
-   }
-   if ((NULL == connection) && (!is_ipv6)) {
-     if((checkHostIp(server->server_addr) == -2)) {
-       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");
-	 set_global_reconnect_reason("Dns_Res_webpa_reconnect");
-	 set_global_reconnect_status(true);
-						
-	 kill(getpid(),SIGTERM);						
-       }
-     }
-   }
-           
-   set_global_conn(connection);
-   return (NULL != connection);
-}
-
-//--------------------------------------------------------------------
-// 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_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;
-  char *redirectURL = NULL;
-
-  if(nopoll_conn_wait_for_status_until_connection_ready(get_global_conn(), 10, 
-	&wait_status, &redirectURL)) 
-  { 
-     FREE_NON_NULL_PTR (redirectURL);
-     return WAIT_SUCCESS;
-  }
-  if(wait_status == 307 || wait_status == 302 || wait_status == 303)    // only when there is a http redirect
-  {
-	char *redirect_ptr = 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) {
-	  ParodusError ("Redirect url error %s\n", redirectURL);
-  	  free (redirectURL);
-	  return WAIT_FAIL;
-	}
-	free (redirectURL);
-	set_current_server (ctx); // set current server to redirect server
-	return WAIT_ACTION_RETRY;
-  }
-  FREE_NON_NULL_PTR (redirectURL);
-  if(wait_status == 403) 
-  {
-	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");
-  return WAIT_FAIL;
-}
-
- 
-//--------------------------------------------------------------------
-// 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
-
-int connect_and_wait (create_connection_ctx_t *ctx)
-{
-  unsigned int force_flags = get_parodus_cfg()->flags;
-  int is_ipv6 = true;
-  int nopoll_connected;
-  int wait_rtn;
-  
-  if( FLAGS_IPV4_ONLY == (FLAGS_IPV4_ONLY & force_flags) ) {
-    is_ipv6 = false;
-  }
-  
-  // This loop will be executed at most twice:
-  // Once for ipv6 and once for ipv4
-  while (true) {
-    nopoll_connected = nopoll_connect (ctx, is_ipv6);
-    wait_rtn = WAIT_FAIL;
-    if (nopoll_connected) {
-      if(nopoll_conn_is_ok(get_global_conn())) { 
-	ParodusPrint("Connected to Server but not yet ready\n");
-	wait_rtn = wait_connection_ready (ctx);
-        if (wait_rtn == WAIT_SUCCESS)
-          return CONN_WAIT_SUCCESS;
-      } else { // nopoll_conn not ok
-	ParodusError("Error connecting to server\n");
-	ParodusError("RDK-10037 - WebPA Connection Lost\n");
-      }
-    } // nopoll_connected
-    
-    if (nopoll_connected) {
-	close_and_unref_connection(get_global_conn());
-	set_global_conn(NULL);
-    }
-
-    if (wait_rtn == WAIT_ACTION_RETRY)
-      return CONN_WAIT_ACTION_RETRY;
-
-    // try ipv4 if we need to      
-    if ((0==force_flags) && (0==ctx->current_server->allow_insecure) && is_ipv6) {
-      is_ipv6 = false;
-      continue;
-    }
-    
-    return CONN_WAIT_RETRY_DNS;
-  }
-}
-
-//--------------------------------------------------------------------
-// Tries to connect until
-// a) success, or
-// b) need to requery dns
-int keep_trying_to_connect (create_connection_ctx_t *ctx, 
-	backoff_timer_t *backoff_timer)
-{
-    int rtn;
-    
-    while (true)
-    {
-      rtn = connect_and_wait (ctx);
-      if (rtn == CONN_WAIT_SUCCESS)
-        return true;
-      if (rtn == CONN_WAIT_ACTION_RETRY) // if redirected or build_headers
-        continue;
-      backoff_delay (backoff_timer); // 3,7,15,31 ..
-      if (rtn == CONN_WAIT_RETRY_DNS)
-        return false;  //find_server again
-      // else retry
-    }
-}
-
-
-//--------------------------------------------------------------------
-
 /**
 * @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)
 {
-  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;
-  
-  if(ctx == NULL) {
+    bool initial_retry = false;
+    int backoffRetryTime = 0;
+    int max_retry_sleep;
+    char port[8];
+    char server_Address[256];
+    char redirectURL[128]={'\0'};
+    char *temp_ptr;
+    //Retry Backoff count shall start at c=2 & calculate 2^c - 1.
+    int c=2;
+    
+    if(ctx == NULL) {
        return nopoll_false;
-  }
+    }
+
+	FILE *fp;
+	fp = fopen("/tmp/parodus_ready", "r");
+
+	if (fp!=NULL)
+	{
+		unlink("/tmp/parodus_ready");
+		ParodusPrint("Closing Parodus_Ready FIle \n");
+		fclose(fp);
+	}

 	ParodusPrint("BootTime In sec: %d\n", get_parodus_cfg()->boot_time);
-	ParodusInfo("Received reboot_reason as:%s\n", get_parodus_cfg()->hw_last_reboot_reason);
 	ParodusInfo("Received reconnect_reason as:%s\n", reconnect_reason);
 	
-	max_retry_count = (int) get_parodus_cfg()->webpa_backoff_max;
-	ParodusPrint("max_retry_count is %d\n", max_retry_count );
-  
-	conn_ctx.nopoll_ctx = ctx;
-	init_expire_timer (&conn_ctx.connect_timer);
-	init_header_info (&conn_ctx.header_info);
-	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)
+	snprintf(port,sizeof(port),"%d",8080);
+	parStrncpy(server_Address, get_parodus_cfg()->webpa_url, sizeof(server_Address));
+	ParodusInfo("server_Address %s\n",server_Address);
+					
+	max_retry_sleep = (int) pow(2, get_parodus_cfg()->webpa_backoff_max) -1;
+	ParodusPrint("max_retry_sleep is %d\n", max_retry_sleep );
+	
+	do
 	{
-	  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))
-		break;
-	  // retry dns query
-	}
-      
-	if(conn_ctx.current_server->allow_insecure <= 0)
+		//calculate backoffRetryTime and to perform exponential increment during retry
+		if(backoffRetryTime < max_retry_sleep)
+		{
+			backoffRetryTime = (int) pow(2, c) -1;
+		}
+		ParodusPrint("New backoffRetryTime value calculated as %d seconds\n", backoffRetryTime);
+								
+        noPollConn *connection;
+		if(get_parodus_cfg()->secureFlag) 
+		{                    
+		    ParodusPrint("secure true\n");
+            connection = nopoll_tls_common_conn(ctx,server_Address, port);                
+		}
+		else 
+		{
+		    ParodusPrint("secure false\n");
+            connection = nopoll_conn_new(ctx, server_Address, port, NULL,
+                       get_parodus_cfg()->webpa_path_url, NULL, NULL);// WEBPA-787
+		}
+        set_global_conn(connection);
+
+		if(get_global_conn() != NULL)
+		{
+			if(!nopoll_conn_is_ok(get_global_conn())) 
+			{
+				ParodusError("Error connecting to server\n");
+				ParodusError("RDK-10037 - WebPA Connection Lost\n");
+				// Copy the server address from config to avoid retrying to the same failing talaria redirected node
+				parStrncpy(server_Address, get_parodus_cfg()->webpa_url, sizeof(server_Address));
+				close_and_unref_connection(get_global_conn());
+				set_global_conn(NULL);
+				initial_retry = true;
+				ParodusInfo("Waiting with backoffRetryTime %d seconds\n", backoffRetryTime);
+				sleep(backoffRetryTime);
+				continue;
+			}
+			else 
+			{
+				ParodusPrint("Connected to Server but not yet ready\n");
+				initial_retry = false;
+				//reset backoffRetryTime back to the starting value, as next reason can be different					
+				c = 2;
+				backoffRetryTime = (int) pow(2, c) -1;
+			}
+
+			if(!nopoll_conn_wait_until_connection_ready(get_global_conn(), 10, redirectURL)) 
+			{
+				
+				if (strncmp(redirectURL, "Redirect:", 9) == 0) // only when there is a http redirect
+				{
+					ParodusError("Received temporary redirection response message %s\n", redirectURL);
+					// Extract server Address and port from the redirectURL
+					temp_ptr = strtok(redirectURL , ":"); //skip Redirect 
+					temp_ptr = strtok(NULL , ":"); // skip https
+					temp_ptr = strtok(NULL , ":");
+					parStrncpy(server_Address, temp_ptr+2, sizeof(server_Address));
+					parStrncpy(port, strtok(NULL , "/"), sizeof(port));
+					ParodusInfo("Trying to Connect to new Redirected server : %s with port : %s\n", server_Address, port);
+					//reset c=2 to start backoffRetryTime as retrying using new redirect server
+					c = 2;
+				}
+				else
+				{
+					ParodusError("Client connection timeout\n");	
+					ParodusError("RDK-10037 - WebPA Connection Lost\n");
+					// Copy the server address from config to avoid retrying to the same failing talaria redirected node
+					parStrncpy(server_Address, get_parodus_cfg()->webpa_url, sizeof(server_Address));
+					ParodusInfo("Waiting with backoffRetryTime %d seconds\n", backoffRetryTime);
+					sleep(backoffRetryTime);
+					c++;
+				}
+				close_and_unref_connection(get_global_conn());
+				set_global_conn(NULL);
+				initial_retry = true;
+				
+			}
+			else 
+			{
+				initial_retry = false;				
+				ParodusInfo("Connection is ready\n");
+			}
+		}
+		else
+		{
+			initial_retry = true;
+			ParodusInfo("Waiting with backoffRetryTime %d seconds\n", backoffRetryTime);
+			sleep(backoffRetryTime);
+			c++;
+			// Copy the server address from config to avoid retrying to the same failing talaria redirected node
+			parStrncpy(server_Address, get_parodus_cfg()->webpa_url, sizeof(server_Address));
+		}
+				
+	}while(initial_retry);
+	
+	if(get_parodus_cfg()->secureFlag) 
 	{
 		ParodusInfo("Connected to server over SSL\n");
 	}
@@ -580,66 +198,65 @@ int createNopollConnection(noPollCtx *ctx)
 		ParodusInfo("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);
-
-	if((get_parodus_cfg()->boot_time != 0) && init) {
-		getCurrentTime(connectTimePtr);
-		ParodusInfo("connect_time-diff-boot_time=%d\n", connectTimePtr->tv_sec - get_parodus_cfg()->boot_time);
-		init = 0; //set init to 0 so that this is logged only during process start up and not during reconnect
-	}
-
-	free_extra_headers (&conn_ctx);
-        free_header_info (&conn_ctx.header_info);
-        free_server_list (&conn_ctx.server_list);
-        
 	// Reset close_retry flag and heartbeatTimer once the connection retry is successful
-	ParodusPrint("createNopollConnection(): reset_close_retry\n");
-	reset_close_retry();
-	reset_heartBeatTimer();
-	set_global_reconnect_reason("webpa_process_starts");
-	set_global_reconnect_status(false);
+	ParodusPrint("createNopollConnection(): close_mut lock\n");
+	pthread_mutex_lock (&close_mut);
+	close_retry = false;
+	pthread_mutex_unlock (&close_mut);
+	ParodusPrint("createNopollConnection(): close_mut unlock\n");
+	heartBeatTimer = 0;
+	// Reset connErr flag on successful connection
+	reconnect_reason = "webpa_process_starts";
+	LastReasonStatus =false;
 	ParodusPrint("LastReasonStatus reset after successful connection\n");
 	setMessageHandlers();

 	return nopoll_true;
-}          
-
-/* Build the extra headers string with any/all conditional logic in one place. */
-static char* build_extra_headers( const char *auth, const char *device_id,
-                                  const char *user_agent, const char *convey )
+}
+static noPollConn * nopoll_tls_common_conn (noPollCtx  * ctx,char * serverAddr,char *serverPort)
 {
-    return nopoll_strdup_printf(
-            "%s%s"
-            "\r\nX-WebPA-Device-Name: %s"
-            "\r\nX-WebPA-Device-Protocols: wrp-0.11,getset-0.1"
-            "\r\nUser-Agent: %s"
-            "%s%s",
-
-            (NULL != auth) ? "\r\nAuthorization: Bearer " : "",
-            (NULL != auth) ? auth: "",
-            device_id,
-            user_agent,
-            (NULL != convey) ? "\r\nX-WebPA-Convey: " : "",
-            (NULL != convey) ? convey : "" );
+        noPollConnOpts * opts;
+        noPollConn *connection = NULL;
+        opts = createConnOpts();
+        ParodusPrint("Trying connection with Ipv6 \n"); 
+        connection = nopoll_conn_tls_new6 (ctx, opts,serverAddr,serverPort,NULL,get_parodus_cfg()->webpa_path_url,NULL,NULL);
+        if(connection == NULL)
+        {
+            ParodusPrint("Ipv6 connection failed. Trying connection with Ipv4 \n");
+            opts = createConnOpts();
+            connection = nopoll_conn_tls_new (ctx, opts,serverAddr,serverPort,NULL,get_parodus_cfg()->webpa_path_url,NULL,NULL);
+        }
+        return connection;
 }

-
-static noPollConnOpts * createConnOpts (char * extra_headers, bool secure)
+static noPollConnOpts * createConnOpts ()
 {
    noPollConnOpts * opts;
+    char device_id[32]={'\0'};
+    char * extra_headers, *conveyHeader = NULL;
+    char user_agent[512]={'\0'};
    
    opts = nopoll_conn_opts_new ();
-    if(secure) 
-	{
-	    if(strlen(get_parodus_cfg()->cert_path) > 0)
-            {
-                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);
-	}
+	nopoll_conn_opts_ssl_peer_verify (opts, nopoll_false);
+	nopoll_conn_opts_set_ssl_protocol (opts, NOPOLL_METHOD_TLSV1_2);
 	nopoll_conn_opts_set_interface (opts,get_parodus_cfg()->webpa_interface_used);	
+    snprintf(user_agent, sizeof(user_agent),"%s (%s; %s/%s;)",
+         ((0 != strlen(get_parodus_cfg()->webpa_protocol)) ? get_parodus_cfg()->webpa_protocol : "unknown"),
+         ((0 != strlen(get_parodus_cfg()->fw_name)) ? get_parodus_cfg()->fw_name : "unknown"),
+         ((0 != strlen(get_parodus_cfg()->hw_model)) ? get_parodus_cfg()->hw_model : "unknown"),
+         ((0 != strlen(get_parodus_cfg()->hw_manufacturer)) ? get_parodus_cfg()->hw_manufacturer : "unknown"));
+
+	ParodusInfo("User-Agent: %s\n",user_agent);
+	conveyHeader = getWebpaConveyHeader();
+	    
+	parStrncpy(deviceMAC, get_parodus_cfg()->hw_mac,sizeof(deviceMAC));
+	snprintf(device_id, sizeof(device_id), "mac:%s", deviceMAC);
+	ParodusInfo("Device_id %s\n",device_id);
+	
+    extra_headers = nopoll_strdup_printf("\r\nX-WebPA-Device-Name: %s"
+		     "\r\nX-WebPA-Device-Protocols: wrp-0.11,getset-0.1"
+		     "\r\nUser-Agent: %s" "\r\nX-WebPA-Convey: %s",device_id,user_agent,(strlen(conveyHeader) > 0)? conveyHeader :"");
+
 	nopoll_conn_opts_set_extra_headers (opts,extra_headers); 
 	return opts;   
 }
--- a/src/connection.h
+++ b/src/connection.h
@@ -1,24 +1,9 @@
-/**
- * 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 connection.h
 *
 * @description This header defines functions required to manage WebSocket client connections.
 *
+ * Copyright (c) 2015  Comcast
 */
 
 #ifndef _CONNECTION_H_
@@ -34,6 +19,9 @@ extern "C" {
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/

+extern bool close_retry;
+extern volatile unsigned int heartBeatTimer;
+extern pthread_mutex_t close_mut;

 /*----------------------------------------------------------------------------*/
 /*                             Function Prototypes                            */
@@ -52,11 +40,6 @@ void set_global_conn(noPollConn *);
 char *get_global_reconnect_reason();
 void set_global_reconnect_reason(char *reason);

-bool get_global_reconnect_status();
-void set_global_reconnect_status(bool status);
-
-int get_cloud_disconnect_time();
-void set_cloud_disconnect_time(int disconnTime);
 #ifdef __cplusplus
 }
 #endif
--- a/src/crud_interface.c
+++ b/src/crud_interface.c
@@ -1,187 +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 crud_interface.c
- *
- * @description This file is used to manage incoming and outgoing CRUD messages.
- *
- */
-
-#include "ParodusInternal.h"
-#include "crud_tasks.h"
-#include "crud_interface.h"
-#include "upstream.h"
-
-/*----------------------------------------------------------------------------*/
-/*                                   Macros                                   */
-/*----------------------------------------------------------------------------*/
-
-pthread_mutex_t crud_mut=PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t crud_con=PTHREAD_COND_INITIALIZER;
-
-
-/*----------------------------------------------------------------------------*/
-/*                             Internal variables                             */
-/*----------------------------------------------------------------------------*/
-
-CrudMsg *crudMsgQ = NULL;
-
-/*----------------------------------------------------------------------------*/
-/*                             External functions                             */
-/*----------------------------------------------------------------------------*/
-
-pthread_cond_t *get_global_crud_con(void)
-{
-    return &crud_con;
-}
-
-pthread_mutex_t *get_global_crud_mut(void)
-{
-    return &crud_mut;
-}
-
-void addCRUDmsgToQueue(wrp_msg_t *crudMsg)
-{
-	CrudMsg * crudMessage;
-	crudMessage = (CrudMsg *)malloc(sizeof(CrudMsg));
-	if(crudMessage && crudMsg!=NULL)
-	{
-		crudMessage->msg = crudMsg;
-		crudMessage->next = NULL;
-		ParodusPrint("Inside addCRUDmsgToQueue : mutex lock in producer \n");
-		pthread_mutex_lock(&crud_mut);
-		if(crudMsgQ ==NULL)
-		{
-			crudMsgQ = crudMessage;
-			ParodusPrint("Producer added message\n");
-			pthread_cond_signal(&crud_con);
-			pthread_mutex_unlock(&crud_mut);
-			ParodusPrint("Inside addCRUDmsgToQueue : mutex unlock in producer \n");
-		}
-		else
-		{
-			CrudMsg *temp = crudMsgQ;
-			while(temp->next)
-			{
-				temp = temp->next;
-			}
-			temp->next = crudMessage;
-			pthread_mutex_unlock(&crud_mut);
-		}
-	}
-	else
-	{
-		ParodusError("Memory allocation failed for CRUD\n");
-	}
-}
-
-
-void *CRUDHandlerTask()
-{
-	int ret = 0;
-	ssize_t resp_size = 0;
-	void *resp_bytes;
-	wrp_msg_t *crud_response = NULL;
-
-	while(FOREVER())
-	{
-		pthread_mutex_lock(&crud_mut);
-		ParodusPrint("Mutex lock in CRUD consumer thread\n");
-
-		if(crudMsgQ !=NULL)
-		{
-			CrudMsg *message = crudMsgQ;
-			crudMsgQ = crudMsgQ->next;
-			pthread_mutex_unlock(&crud_mut);
-			ParodusPrint("Mutex unlock in CRUD consumer thread\n");
-
-			ret = processCrudRequest(message->msg, &crud_response);
-			wrp_free_struct(message->msg);
-			free(message);
-			message = NULL;
-
-			if(ret == 0)
-			{
-				ParodusInfo("CRUD processed successfully\n");
-			}
-			else
-			{
-				ParodusError("Failure in CRUD request processing !!\n");
-			}
-			ParodusPrint("msgpack encode to send to upstream\n");
-			resp_size = wrp_struct_to( crud_response, WRP_BYTES, &resp_bytes );
-			ParodusPrint("Encoded CRUD resp_size :%lu\n", resp_size);
-
-			ParodusPrint("Adding CRUD response to upstreamQ\n");
-			addCRUDresponseToUpstreamQ(resp_bytes, resp_size);
-			wrp_free_struct(crud_response);
-		}
-		else
-		{
-			if (g_shutdown) {
-			  pthread_mutex_unlock (&crud_mut);
-			  break;
-			}
-			pthread_cond_wait(&crud_con, &crud_mut);
-			pthread_mutex_unlock (&crud_mut);
-		}
-	}
-	return 0;
-}
-
-
-//CRUD Producer adds the response into common UpStreamQ
-void addCRUDresponseToUpstreamQ(void *response_bytes, ssize_t response_size)
-{
-	UpStreamMsg *response;
-
-	response = (UpStreamMsg *)malloc(sizeof(UpStreamMsg));
-	if(response)
-	{
-		response->msg =(void *)response_bytes;
-		response->len =(int)response_size;
-		response->next=NULL;
-		pthread_mutex_lock (get_global_nano_mut());
-		ParodusPrint("Mutex lock in CRUD response producer\n");
-
-		if(get_global_UpStreamMsgQ() == NULL)
-		{
-			set_global_UpStreamMsgQ(response);
-			ParodusPrint("Producer added CRUD response to UpStreamQ\n");
-			pthread_cond_signal(get_global_nano_con());
-			pthread_mutex_unlock (get_global_nano_mut());
-			ParodusPrint("mutex unlock in CRUD response producer\n");
-		}
-		else
-		{
-			ParodusPrint("Producer adding CRUD response to UpStreamQ\n");
-			UpStreamMsg *temp = get_global_UpStreamMsgQ();
-			while(temp->next)
-			{
-				temp = temp->next;
-			}
-			temp->next = response;
-			pthread_mutex_unlock (get_global_nano_mut());
-		}
-	}
-	else
-	{
-		ParodusError("failure in allocation for CRUD response\n");
-	}
-
-}
-
--- a/src/crud_interface.h
+++ b/src/crud_interface.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 crud_interface.h
- *
- * @description This header defines functions required to manage CRUD messages.
- *
- */
- 
-#ifndef _CRUD_INTERFACE_H_
-#define _CRUD_INTERFACE_H_
-
-#include <pthread.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*----------------------------------------------------------------------------*/
-/*                               Data Structures                              */
-/*----------------------------------------------------------------------------*/
-typedef struct CrudMsg__
-{
-	wrp_msg_t *msg;
-	struct CrudMsg__ *next;
-} CrudMsg;
-
-/*----------------------------------------------------------------------------*/
-/*                             Function Prototypes                            */
-/*----------------------------------------------------------------------------*/
-
-void addCRUDresponseToUpstreamQ(void *response_bytes, ssize_t response_size);
-pthread_cond_t *get_global_crud_con(void);
-pthread_mutex_t *get_global_crud_mut(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* _CRUD_INTERFACE_H_ */
-
--- a/src/crud_internal.c
+++ b/src/crud_internal.c
--- a/src/crud_internal.h
+++ b/src/crud_internal.h
@@ -1,27 +0,0 @@
-/**
- * Copyright 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 <wrp-c.h>
-#include <stdlib.h>
-
-int createObject( wrp_msg_t *reqMsg, wrp_msg_t **response );
-int retrieveObject( wrp_msg_t *reqMsg, wrp_msg_t **response);
-int updateObject( wrp_msg_t *reqMsg, wrp_msg_t **response);
-int deleteObject(wrp_msg_t *reqMsg, wrp_msg_t **response);
-
-int writeToJSON(char *data);
-int readFromJSON(char **data);
-int retrieveFromMemory(char *keyName, cJSON **jsonresponse);
--- a/src/crud_tasks.c
+++ b/src/crud_tasks.c
@@ -1,109 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <cJSON.h>
-#include <wrp-c.h>
-#include "crud_tasks.h"
-#include "crud_internal.h"
-
-
-int processCrudRequest( wrp_msg_t *reqMsg, wrp_msg_t **responseMsg)
-{
-	wrp_msg_t *resp_msg = NULL;
-    int ret = -1;
-
-    resp_msg = ( wrp_msg_t *)malloc( sizeof( wrp_msg_t ) );  
-    memset(resp_msg, 0, sizeof(wrp_msg_t));
-
-    resp_msg->msg_type = reqMsg->msg_type;
-    resp_msg->u.crud.transaction_uuid = strdup(reqMsg->u.crud.transaction_uuid);
-    resp_msg->u.crud.source = strdup(reqMsg->u.crud.dest);
-    resp_msg->u.crud.dest = strdup(reqMsg->u.crud.source);
-
-    switch( reqMsg->msg_type ) 
-    {
-
-	case WRP_MSG_TYPE__CREATE:
-	ParodusInfo( "CREATE request\n" );
-
-	ret = createObject( reqMsg, &resp_msg );
-
-	if(ret != 0)
-	{
-		ParodusError("Failed to create object in config JSON\n");
-
-		//WRP payload is NULL for failure cases
-		resp_msg ->u.crud.payload = NULL;
-		resp_msg ->u.crud.payload_size = 0;
-		*responseMsg = resp_msg;
-		return -1;
-	}
-
-	*responseMsg = resp_msg;
-	break;
-
-	case WRP_MSG_TYPE__RETREIVE:
-	ParodusInfo( "RETREIVE request\n" );
-
-	ret = retrieveObject( reqMsg, &resp_msg );
-	if(ret != 0)
-	{
-	    ParodusError("Failed to retrieve object \n");
-
-	    //WRP payload is NULL for failure cases
-	    resp_msg ->u.crud.payload = NULL;
-	    resp_msg ->u.crud.payload_size = 0;
-	    *responseMsg = resp_msg;
-	    return -1;
-	}
-
-	*responseMsg = resp_msg;
-	break;
-
-	case WRP_MSG_TYPE__UPDATE:
-	ParodusInfo( "UPDATE request\n" );
-
-	ret = updateObject( reqMsg, &resp_msg );
-	if(ret ==0)
-	{
-		//WRP payload is NULL for update requests
-		resp_msg ->u.crud.payload = NULL;
-		resp_msg ->u.crud.payload_size = 0;
-	}
-	else
-	{
-		ParodusError("Failed to update object \n");
-		*responseMsg = resp_msg;
-		return -1;
-	}
-	*responseMsg = resp_msg;
-	break;
-
-	case WRP_MSG_TYPE__DELETE:
-	ParodusInfo( "DELETE request\n" );
-
-	ret = deleteObject(reqMsg, &resp_msg );
-	if(ret == 0)
-	{
-		//WRP payload is NULL for delete requests
-		resp_msg ->u.crud.payload = NULL;
-		resp_msg ->u.crud.payload_size = 0;
-	}
-	else
-	{
-		ParodusError("Failed to delete object \n");
-		*responseMsg = resp_msg;
-		return -1;
-	}
-	*responseMsg = resp_msg;
-	break;
-
-	default:
-	    ParodusInfo( "Unknown msgType for CRUD request\n" );
-	    *responseMsg = resp_msg;
-	    break;
-     }
-
-    return  0;
-}
-
--- a/src/crud_tasks.h
+++ b/src/crud_tasks.h
@@ -1,31 +0,0 @@
-/**
- * Copyright 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 <wrp-c.h>
-#include "ParodusInternal.h"
-
-/**
- * @brief processCrudRequest function to process CRUD operations.
- *
- * @note processCrudRequest function allocates memory for response, 
- * caller needs to free the response (resMsg) in both success and failure case.
- * @param[in] decoded request in wrp_msg_t structure format
- * @param[out] resulting wrp_msg_t structure as a response 
- * @return  0 in success case and -1 in error case
- */
-int processCrudRequest(wrp_msg_t * reqMsg, wrp_msg_t **resMsg);
--- a/src/downstream.c
+++ b/src/downstream.c
@@ -1,24 +1,9 @@
-/**
- * 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 downstream.c
 *
 * @description This describes functions required to manage downstream messages.
 *
+ * Copyright (c) 2015  Comcast
 */

 #include "downstream.h"
@@ -26,11 +11,7 @@
 #include "connection.h"
 #include "partners_check.h"
 #include "ParodusInternal.h"
-#include "crud_interface.h"
-/*----------------------------------------------------------------------------*/
-/*                             Function Prototypes                            */
-/*----------------------------------------------------------------------------*/
-static void createNewMsgForCRUD(wrp_msg_t *message, wrp_msg_t **crudMessage );
+
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
@@ -45,7 +26,6 @@ void listenerOnMessage(void * msg, size_t msgSize)
 {
    int rv =0;
    wrp_msg_t *message;
-    wrp_msg_t *crudMessage= NULL;
    char* destVal = NULL;
    char dest[32] = {'\0'};
    int msgType;
@@ -62,7 +42,7 @@ void listenerOnMessage(void * msg, size_t msgSize)

    recivedMsg =  (const char *) msg;

-    ParodusInfo("Received msg from server\n");
+    ParodusInfo("Received msg from server:%s\n", recivedMsg);
    if(recivedMsg!=NULL) 
    {
        /*** Decoding downstream recivedMsg to check destination ***/
@@ -73,294 +53,90 @@ void listenerOnMessage(void * msg, size_t msgSize)
            ParodusPrint("\nDecoded recivedMsg of size:%d\n", rv);
            msgType = message->msg_type;
            ParodusInfo("msgType received:%d\n", msgType);
-            
-            switch( message->msg_type )
+
+            if(message->msg_type == WRP_MSG_TYPE__REQ)
            {
-                case WRP_MSG_TYPE__AUTH:
+                ParodusPrint("numOfClients registered is %d\n", get_numOfClients());
+                int ret = validate_partner_id(message, NULL);
+                if(ret < 0)
                {
-                    ParodusInfo("Authorization Status received with Status code :%d\n", message->u.auth.status);
-                    break;
+                    response = cJSON_CreateObject();
+                    cJSON_AddNumberToObject(response, "statusCode", 430);
+                    cJSON_AddStringToObject(response, "message", "Invalid partner_id");
                }

-                case WRP_MSG_TYPE__EVENT:
-                case WRP_MSG_TYPE__REQ:
-                case WRP_MSG_TYPE__CREATE:
-                case WRP_MSG_TYPE__UPDATE:
-                case WRP_MSG_TYPE__RETREIVE:
-                case WRP_MSG_TYPE__DELETE:
+                if((message->u.req.dest !=NULL) && (ret >= 0))
                {
-                    ParodusPrint("numOfClients registered is %d\n", get_numOfClients());
-                    int ret = validate_partner_id(message, NULL);
-                    if(ret < 0)
+                    destVal = message->u.req.dest;
+                    strtok(destVal , "/");
+                    parStrncpy(dest,strtok(NULL , "/"), sizeof(dest));
+                    ParodusInfo("Received downstream dest as :%s\n", dest);
+                    temp = get_global_node();
+                    //Checking for individual clients & Sending to each client
+
+                    while (NULL != temp)
                    {
+                        ParodusPrint("node is pointing to temp->service_name %s \n",temp->service_name);
+                        // Sending message to registered clients
+                        if( strcmp(dest, temp->service_name) == 0)
+                        {
+                            ParodusPrint("sending to nanomsg client %s\n", dest);
+                            bytes = nn_send(temp->sock, recivedMsg, msgSize, 0);
+                            ParodusInfo("sent downstream message '%s' to reg_client '%s'\n",recivedMsg,temp->url);
+                            ParodusPrint("downstream bytes sent:%d\n", bytes);
+                            destFlag =1;
+                            break;
+                        }
+                        ParodusPrint("checking the next item in the list\n");
+                        temp= temp->next;
+                    }
+
+                    //if any unknown dest received sending error response to server
+                    if(destFlag ==0)
+                    {
+                        ParodusError("Unknown dest:%s\n", dest);
                        response = cJSON_CreateObject();
-                        cJSON_AddNumberToObject(response, "statusCode", 403);
-                        cJSON_AddStringToObject(response, "message", "Invalid partner_id");
-                    } 
-
-                      
-                    destVal = strdup(((WRP_MSG_TYPE__EVENT == msgType) ? message->u.event.dest : 
-                              ((WRP_MSG_TYPE__REQ   == msgType) ? message->u.req.dest : message->u.crud.dest)));
-
-                    if( (destVal != NULL) && (ret >= 0) )
-                    {
-						char *newDest = NULL;
-						char *tempDest = strtok(destVal , "/");
-						if(tempDest != NULL)
-						{
-							newDest = strtok(NULL , "/");
-						}
-						if(newDest != NULL)
-						{
-							parStrncpy(dest,newDest, sizeof(dest));
-						}
-						else
-						{
-							parStrncpy(dest,destVal, sizeof(dest));
-						}
-                        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)));
-                        
-                        free(destVal);
-
-                        temp = get_global_node();
-                        //Checking for individual clients & Sending to each client
-
-                        while (NULL != temp)
-                        {
-                            ParodusPrint("node is pointing to temp->service_name %s \n",temp->service_name);
-                            // Sending message to registered clients
-                            if( strcmp(dest, temp->service_name) == 0)
-                            {
-                                ParodusPrint("sending to nanomsg client %s\n", dest);
-                                bytes = nn_send(temp->sock, recivedMsg, msgSize, 0);
-                                ParodusInfo("sent downstream message to reg_client '%s'\n",temp->url);
-                                ParodusPrint("downstream bytes sent:%d\n", bytes);
-                                destFlag =1;
-                                break;
-                            }
-                            ParodusPrint("checking the next item in the list\n");
-                            temp= temp->next;
-                        }
-                        release_global_node ();
-
-			/* check Downstream dest for CRUD requests */
-			if(destFlag ==0 && strcmp("parodus", dest)==0)
-			{
-							ParodusPrint("Received CRUD request : dest : %s\n", dest);
-							if ((message->u.crud.source == NULL) || (message->u.crud.transaction_uuid == NULL))
-							{
-								ParodusError("Invalid request\n");
-								response = cJSON_CreateObject();
-								cJSON_AddNumberToObject(response, "statusCode", 400);
-								cJSON_AddStringToObject(response, "message", "Invalid Request");
-								ret = -1;
-							}
-							else
-							{
-							    createNewMsgForCRUD(message, &crudMessage);
-							    addCRUDmsgToQueue(crudMessage);
-							}
-							destFlag =1;
-			}
-			//if any unknown dest received sending error response to server
-                        if(destFlag ==0)
-                        {
-                            ParodusError("Unknown dest:%s\n", dest);
-                            response = cJSON_CreateObject();
-                            cJSON_AddNumberToObject(response, "statusCode", 531);
-                            cJSON_AddStringToObject(response, "message", "Service Unavailable");
-                        }
+                        cJSON_AddNumberToObject(response, "statusCode", 531);
+                        cJSON_AddStringToObject(response, "message", "Service Unavailable");
                    }
-
-                    if( (WRP_MSG_TYPE__EVENT != msgType) &&
-                        ((destFlag == 0) || (ret < 0)) )
-                    {
-                        resp_msg = (wrp_msg_t *)malloc(sizeof(wrp_msg_t));
-                        memset(resp_msg, 0, sizeof(wrp_msg_t));
-
-                        resp_msg ->msg_type = msgType;
-                        if( WRP_MSG_TYPE__REQ == msgType )
-                        {
-                            resp_msg ->u.req.source = message->u.req.dest;
-                            resp_msg ->u.req.dest = message->u.req.source;
-                            resp_msg ->u.req.transaction_uuid=message->u.req.transaction_uuid;
-                        }
-                        else
-                        {
-                            resp_msg ->u.crud.source = message->u.crud.dest;
-				if(message->u.crud.source !=NULL)
-				{
-					resp_msg ->u.crud.dest = message->u.crud.source;
-				}
-				else
-				{
-					resp_msg ->u.crud.dest = "unknown";
-				}
-                            resp_msg ->u.crud.transaction_uuid = message->u.crud.transaction_uuid;
-                            resp_msg ->u.crud.path =             message->u.crud.path;
-                        }
-
-                        if(response != NULL)
-                        {
-                            str = cJSON_PrintUnformatted(response);
-                            ParodusInfo("Payload Response: %s\n", str);
-
-                            if( WRP_MSG_TYPE__REQ == msgType )
-                            {
-                                resp_msg ->u.req.payload = (void *)str;
-                                resp_msg ->u.req.payload_size = strlen(str);
-                            }
-                            else
-                            {
-                                resp_msg ->u.crud.payload = (void *)str;
-                                resp_msg ->u.crud.payload_size = strlen(str);
-                            }
-
-                            ParodusPrint("msgpack encode\n");
-                            resp_size = wrp_struct_to( resp_msg, WRP_BYTES, &resp_bytes );
-                            if(resp_size > 0)
-                            {
-                                size = (size_t) resp_size;
-                                sendUpstreamMsgToServer(&resp_bytes, size);
-                            }
-                            free(str);
-                            cJSON_Delete(response);
-                            free(resp_bytes);
-                            resp_bytes = NULL;
-                        }
-                        free(resp_msg);
-                    }
-                    break;
                }

-                case WRP_MSG_TYPE__SVC_REGISTRATION:
-                case WRP_MSG_TYPE__SVC_ALIVE:
-                case WRP_MSG_TYPE__UNKNOWN:
-                default:
-                    break;
+                if(destFlag == 0 || ret < 0)
+                {
+                    resp_msg = (wrp_msg_t *)malloc(sizeof(wrp_msg_t));
+                    memset(resp_msg, 0, sizeof(wrp_msg_t));
+
+                    resp_msg ->msg_type = msgType;
+                    resp_msg ->u.req.source = message->u.req.dest;
+                    resp_msg ->u.req.dest = message->u.req.source;
+                    resp_msg ->u.req.transaction_uuid=message->u.req.transaction_uuid;
+
+                    if(response != NULL)
+                    {
+                        str = cJSON_PrintUnformatted(response);
+                        ParodusInfo("Payload Response: %s\n", str);
+
+                        resp_msg ->u.req.payload = (void *)str;
+                        resp_msg ->u.req.payload_size = strlen(str);
+
+                        ParodusPrint("msgpack encode\n");
+                        resp_size = wrp_struct_to( resp_msg, WRP_BYTES, &resp_bytes );
+                        if(resp_size > 0)
+                        {
+                            size = (size_t) resp_size;
+                            sendUpstreamMsgToServer(&resp_bytes, size);
+                        }
+                        free(str);
+                    }
+                    free(resp_msg);
+                }
            }
-            ParodusPrint("free for downstream decoded msg\n");
-            wrp_free_struct(message);
-            message = NULL;
        }
        else
        {
            ParodusError( "Failure in msgpack decoding for receivdMsg: rv is %d\n", rv );
        }
-    }
-}
-/*----------------------------------------------------------------------------*/
-/*                             Internal Functions                             */
-/*----------------------------------------------------------------------------*/
-/**
- * @brief createNewMsgForCRUD function to create new message for processing CRUD requests
- *
- * @param[in] message The message received from server
- * @param[out] crudMessage New message for processing CRUD requests
- */
-static void createNewMsgForCRUD(wrp_msg_t *message, wrp_msg_t **crudMessage )
-{
-    wrp_msg_t *msg;
-    msg = ( wrp_msg_t * ) malloc( sizeof( wrp_msg_t ) );
-    size_t i;
-    if(msg != NULL)
-    {
-        memset( msg, 0, sizeof( wrp_msg_t ) );
-        msg->msg_type = message->msg_type;
-        if(message->u.crud.source != NULL)
-        {
-            ParodusPrint("message->u.crud.source = %s\n",message->u.crud.source);
-            msg->u.crud.source = strdup(message->u.crud.source);
-        }
-
-        if(message->u.crud.dest!= NULL)
-        {
-            ParodusPrint("message->u.crud.dest = %s\n",message->u.crud.dest);
-            msg->u.crud.dest = strdup(message->u.crud.dest);
-        }
-
-        if(message->u.crud.transaction_uuid != NULL)
-        {
-            ParodusPrint("message->u.crud.transaction_uuid = %s\n",message->u.crud.transaction_uuid);
-            msg->u.crud.transaction_uuid = strdup(message->u.crud.transaction_uuid);
-        }
-
-        if(message->u.crud.partner_ids!= NULL && message->u.crud.partner_ids->count >0)
-        {
-            msg->u.crud.partner_ids = ( partners_t * ) malloc( sizeof( partners_t ) +
-                                                              sizeof( char * ) * message->u.crud.partner_ids->count );
-            if(msg->u.crud.partner_ids != NULL)
-            {
-                msg->u.crud.partner_ids->count = message->u.crud.partner_ids->count;
-                for(i = 0; i<message->u.crud.partner_ids->count; i++)
-                {
-                    ParodusPrint("message->u.crud.partner_ids->partner_ids[%d] = %s\n",i,message->u.crud.partner_ids->partner_ids[i]);
-                    msg->u.crud.partner_ids->partner_ids[i] = strdup(message->u.crud.partner_ids->partner_ids[i]);
-                }
-            }
-        }
-
-        if(message->u.crud.headers!= NULL && message->u.crud.headers->count >0)
-        {
-            msg->u.crud.headers = ( headers_t * ) malloc( sizeof( headers_t ) +
-                                                                sizeof( char * ) * message->u.crud.headers->count );
-            if(msg->u.crud.headers != NULL)
-            {
-                msg->u.crud.headers->count = message->u.crud.headers->count;
-                for(i = 0; i<message->u.crud.headers->count; i++)
-                {
-                    ParodusPrint("message->u.crud.headers->headers[%d] = %s\n",i,message->u.crud.headers->headers[i]);
-                    msg->u.crud.headers->headers[i] = strdup(message->u.crud.headers->headers[i]);
-                }
-            }
-        }
-
-        if(message->u.crud.metadata != NULL && message->u.crud.metadata->count > 0)
-        {
-            msg->u.crud.metadata = (data_t *) malloc( sizeof( data_t ) );
-            if(msg->u.crud.metadata != NULL)
-            {
-                memset( msg->u.crud.metadata, 0, sizeof( data_t ) );
-                msg->u.crud.metadata->count = message->u.crud.metadata->count;
-                msg->u.crud.metadata->data_items = ( struct data* )malloc( sizeof( struct data ) * ( message->u.crud.metadata->count ) );
-                for(i=0; i<message->u.crud.metadata->count; i++)
-                {
-                    if(message->u.crud.metadata->data_items[i].name != NULL)
-                    {
-                        ParodusPrint("message->u.crud.metadata->data_items[%d].name : %s\n",i,message->u.crud.metadata->data_items[i].name);
-                        msg->u.crud.metadata->data_items[i].name = strdup(message->u.crud.metadata->data_items[i].name);
-                    }
-                    if(message->u.crud.metadata->data_items[i].value != NULL)
-                    {
-                        ParodusPrint("message->u.crud.metadata->data_items[%d].value : %s\n",i,message->u.crud.metadata->data_items[i].value);
-                        msg->u.crud.metadata->data_items[i].value = strdup(message->u.crud.metadata->data_items[i].value);
-                    }
-                }
-            }
-        }
-        msg->u.crud.include_spans = message->u.crud.include_spans;
-        if(message->u.crud.content_type != NULL)
-        {
-            ParodusPrint("message->u.crud.content_type : %s\n",message->u.crud.content_type);
-            msg->u.crud.content_type = strdup(message->u.crud.content_type);
-        }
-        msg->u.crud.spans.spans = NULL;   /* not supported */
-        msg->u.crud.spans.count = 0;     /* not supported */
-        msg->u.crud.status = message->u.crud.status;
-        msg->u.crud.rdr = message->u.crud.rdr;
-        if(message->u.crud.payload != NULL)
-        {
-            ParodusPrint("message->u.crud.payload = %s\n", (char *)message->u.crud.payload);
-            msg->u.crud.payload = strdup((char *)message->u.crud.payload);
-        }
-        msg->u.crud.payload_size = message->u.crud.payload_size;
-        if(message->u.crud.path != NULL)
-        {
-            ParodusPrint("message->u.crud.path = %s\n", message->u.crud.path);
-            msg->u.crud.path = strdup(message->u.crud.path);
-        }
-        *crudMessage = msg;
+        ParodusPrint("free for downstream decoded msg\n");
+        wrp_free_struct(message);
    }
 }
--- a/src/downstream.h
+++ b/src/downstream.h
@@ -1,24 +1,9 @@
-/**
- * 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 downstream.h
 *
 * @description This header defines functions required to manage downstream messages.
 *
+ * Copyright (c) 2015  Comcast
 */
 
 #ifndef _DOWNSTREAM_H_
--- a/src/heartBeat.c
+++ b/src/heartBeat.c
@@ -1,56 +0,0 @@
-/**
- * Copyright 2018 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 heartBeat.c
- *
- * @description This decribes functions required to manage heartBeatTimer.
- *
- */
-
-#include "heartBeat.h"
-
-volatile unsigned int heartBeatTimer = 0;
-
-pthread_mutex_t heartBeat_mut=PTHREAD_MUTEX_INITIALIZER;
-
-// Get value of heartBeatTimer
-unsigned int get_heartBeatTimer() 
-{
-	unsigned int tmp = 0;
-	pthread_mutex_lock (&heartBeat_mut);
-	tmp = heartBeatTimer;
-	pthread_mutex_unlock (&heartBeat_mut);
-	return tmp;
-}
-
-// Reset value of heartBeatTimer to 0
-void reset_heartBeatTimer() 
-{
-	pthread_mutex_lock (&heartBeat_mut);
-	heartBeatTimer = 0;
-	pthread_mutex_unlock (&heartBeat_mut);
-}
-
-// Increment value of heartBeatTimer to desired value
-void increment_heartBeatTimer(unsigned int inc_time_ms) 
-{
-	pthread_mutex_lock (&heartBeat_mut);
-	heartBeatTimer += inc_time_ms;
-	pthread_mutex_unlock (&heartBeat_mut);
-}
-
-
--- a/src/heartBeat.h
+++ b/src/heartBeat.h
@@ -1,46 +0,0 @@
-/**
- * Copyright 2018 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 heartBeat.h
- *
- * @description This decribes functions required to manage heartBeatTimer.
- *
- */
-
-#ifndef _HEARBEAT_H_
-#define _HEARBEAT_H_
-
-#include <pthread.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Get value of heartBeatTimer
-unsigned int get_heartBeatTimer();
-
-// Reset value of heartBeatTimer to 0
-void reset_heartBeatTimer();
-
-// Increment value of heartBeatTimer to desired value
-void increment_heartBeatTimer(unsigned int inc_time_ms);
-
-#ifdef __cplusplus
-}
-#endif
-    
-#endif
--- a/src/main.c
+++ b/src/main.c
@@ -16,15 +16,10 @@
 */
 
 #include <string.h>
-#include "stdlib.h"
+
 #include "config.h"
 #include "conn_interface.h"
 #include "parodus_log.h"
-#ifdef INCLUDE_BREAKPAD
-#include "breakpad_wrapper.h"
-#else
-#include "signal.h"
-#endif

 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */
@@ -44,45 +39,20 @@
 /*----------------------------------------------------------------------------*/
 /*                             Function Prototypes                            */
 /*----------------------------------------------------------------------------*/
-#ifndef INCLUDE_BREAKPAD
-static void sig_handler(int sig);
-#endif
+/* none */

 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
 int main( int argc, char **argv)
 {
-#ifdef INCLUDE_BREAKPAD
-    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;
-
-    /* TODO not ideal, but it fixes a more major problem for now. */
-    cfg = get_parodus_cfg();
-    memset(cfg,0,sizeof(ParodusCfg));
+    ParodusCfg parodusCfg;
+    memset(&parodusCfg,0,sizeof(parodusCfg));
    
    ParodusInfo("********** Starting component: Parodus **********\n "); 
-    setDefaultValuesToCfg(cfg);
-    if (0 != parseCommandLine(argc,argv,cfg)) {
-		abort();
-	}
-    getAuthToken(cfg);
+    parseCommandLine(argc,argv,&parodusCfg);
     
-    createSocketConnection( NULL);
+    createSocketConnection(&parodusCfg,NULL);
    
    return 0;
 }
@@ -95,45 +65,4 @@ const char *rdk_logger_module_fetch(void)
 /*----------------------------------------------------------------------------*/
 /*                             Internal functions                             */
 /*----------------------------------------------------------------------------*/
-#ifndef INCLUDE_BREAKPAD
-static void sig_handler(int sig)
-{
-
-	if ( sig == SIGINT ) 
-	{
-		signal(SIGINT, sig_handler); /* reset it to this function */
-		ParodusInfo("SIGINT received!\n");
-		shutdownSocketConnection();
-	}
-	else if ( sig == SIGUSR1 ) 
-	{
-		signal(SIGUSR1, sig_handler); /* reset it to this function */
-		ParodusInfo("SIGUSR1 received!\n");
-	}
-	else if ( sig == SIGUSR2 ) 
-	{
-		ParodusInfo("SIGUSR2 received!\n");
-	}
-	else if ( sig == SIGCHLD ) 
-	{
-		signal(SIGCHLD, sig_handler); /* reset it to this function */
-		ParodusInfo("SIGHLD received!\n");
-	}
-	else if ( sig == SIGPIPE ) 
-	{
-		signal(SIGPIPE, sig_handler); /* reset it to this function */
-		ParodusInfo("SIGPIPE received!\n");
-	}
-	else if ( sig == SIGALRM ) 
-	{
-		signal(SIGALRM, sig_handler); /* reset it to this function */
-		ParodusInfo("SIGALRM received!\n");
-	}
-	else 
-	{
-		ParodusInfo("Signal %d received!\n", sig);
-		shutdownSocketConnection();
-	}
-	
-}
-#endif
+/* none */
--- a/src/nopoll_handlers.c
+++ b/src/nopoll_handlers.c
@@ -1,31 +1,14 @@
-/**
- * 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 nopoll_handlers.c
 *
 * @description This describes nopoll handler functions.
 *
+ * Copyright (c) 2015  Comcast
 */

 #include "ParodusInternal.h"
 #include "nopoll_handlers.h"
 #include "connection.h"
-#include "heartBeat.h"
-#include "close_retry.h"

 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */
@@ -38,7 +21,6 @@
 pthread_mutex_t g_mutex=PTHREAD_MUTEX_INITIALIZER;
 pthread_cond_t g_cond=PTHREAD_COND_INITIALIZER;
 ParodusMsg *ParodusMsgQ = NULL;
-noPollMsg * previous_msg = NULL;

 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
@@ -57,43 +39,18 @@ void listenerOnMessage_queue(noPollCtx * ctx, noPollConn * conn, noPollMsg * msg
    UNUSED(ctx);
    UNUSED(conn);
    UNUSED(user_data);
-    noPollMsg  * aux;
-
-	if (nopoll_msg_is_fragment (msg))
-	{
-		ParodusInfo("Found fragment, FIN = %d \n", nopoll_msg_is_final (msg));
-		aux          = previous_msg;
-		previous_msg = nopoll_msg_join (previous_msg, msg);
-		nopoll_msg_unref (aux);
-
-		if (! nopoll_msg_is_final (msg)) {
-			ParodusInfo ("Found fragment that is not final..\n");
-			return;
-		}
-		ParodusInfo("Found final fragment *** \n");
-	}

    ParodusMsg *message;
    message = (ParodusMsg *)malloc(sizeof(ParodusMsg));

    if(message)
    {
-        if(previous_msg)
-        {
-			message->msg = previous_msg;
-		    message->payload = (void *)nopoll_msg_get_payload (previous_msg);
-		    message->len = nopoll_msg_get_payload_size (previous_msg);
-		    message->next = NULL;
-        }
-        else
-        {
-			message->msg = msg;
-			message->payload = (void *)nopoll_msg_get_payload (msg);
-			message->len = nopoll_msg_get_payload_size (msg);
-			message->next = NULL;
+        message->msg = msg;
+        message->payload = (void *)nopoll_msg_get_payload (msg);
+        message->len = nopoll_msg_get_payload_size (msg);
+        message->next = NULL;

        nopoll_msg_ref(msg);
-		}

        pthread_mutex_lock (&g_mutex);		
        ParodusPrint("mutex lock in producer thread\n");
@@ -122,7 +79,6 @@ void listenerOnMessage_queue(noPollCtx * ctx, noPollConn * conn, noPollMsg * msg
        //Memory allocation failed
        ParodusError("Memory allocation is failed\n");
    }
-	previous_msg = NULL;
    ParodusPrint("*****Returned from listenerOnMessage_queue*****\n");
 }

@@ -138,7 +94,6 @@ void listenerOnPingMessage (noPollCtx * ctx, noPollConn * conn, noPollMsg * msg,
 {
    UNUSED(ctx);
    UNUSED(user_data);
-    UNUSED(conn);

    noPollPtr payload = NULL;
    payload = (noPollPtr ) nopoll_msg_get_payload(msg);
@@ -148,7 +103,9 @@ void listenerOnPingMessage (noPollCtx * ctx, noPollConn * conn, noPollMsg * msg,
        ParodusInfo("Ping received with payload %s, opcode %d\n",(char *)payload, nopoll_msg_opcode(msg));
        if (nopoll_msg_opcode(msg) == NOPOLL_PING_FRAME) 
        {
-            reset_heartBeatTimer();
+            nopoll_conn_send_frame (conn, nopoll_true, nopoll_true, NOPOLL_PONG_FRAME, strlen(payload), payload, 0);
+            heartBeatTimer = 0;
+            ParodusPrint("Sent Pong frame and reset HeartBeat Timer\n");
        }
    }
 }
@@ -157,26 +114,22 @@ void listenerOnCloseMessage (noPollCtx * ctx, noPollConn * conn, noPollPtr user_
 {
    UNUSED(ctx);
    UNUSED(conn);
-    UNUSED(user_data);
-    int closeStatus;
-    char * defaultReason = "SSL_Socket_Close";

    ParodusPrint("listenerOnCloseMessage(): mutex lock in producer thread\n");

-    closeStatus = nopoll_conn_get_close_status (conn);
-    if( closeStatus == 1006 && !get_global_reconnect_status())
+    if((user_data != NULL) && (strstr(user_data, "SSL_Socket_Close") != NULL) && !LastReasonStatus)
    {
-	ParodusInfo("Reconnect detected, setting default Reconnect reason %s\n",defaultReason);
-        set_global_reconnect_reason(defaultReason);
-        set_global_reconnect_status(true);
+        set_global_reconnect_reason("Server_closed_connection");
+        LastReasonStatus = true;
    }
-    else if(!get_global_reconnect_status())
+    else if ((user_data == NULL) && !LastReasonStatus)
    {
-    	ParodusInfo("Reconnect detected, setting Reconnect reason as Unknown\n");
        set_global_reconnect_reason("Unknown");
    }

-    set_close_retry();
+    pthread_mutex_lock (&close_mut);
+    close_retry = true;
+    pthread_mutex_unlock (&close_mut);
    ParodusPrint("listenerOnCloseMessage(): mutex unlock in producer thread\n");
 }

--- a/src/nopoll_handlers.h
+++ b/src/nopoll_handlers.h
@@ -1,24 +1,9 @@
-/**
- * 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 nopoll_handlers.h
 *
 * @description This header defines nopoll handler functions.
 *
+ * Copyright (c) 2015  Comcast
 */

 #ifndef _NOPOLL_HANDLERS_H_
@@ -36,6 +21,9 @@ extern "C" {

 extern pthread_mutex_t g_mutex;
 extern pthread_cond_t g_cond; 
+extern pthread_mutex_t close_mut;
+extern volatile unsigned int heartBeatTimer;
+extern bool close_retry;

 /*----------------------------------------------------------------------------*/
 /*                             Function Prototypes                            */
--- a/src/nopoll_helpers.c
+++ b/src/nopoll_helpers.c
@@ -1,31 +1,15 @@
-/**
- * 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 nopoll_helpers.c
 *
 * @description This file is used to manage incomming and outgoing messages.
 *
+ * Copyright (c) 2015  Comcast
 */

 #include "ParodusInternal.h"
 #include "connection.h"
 #include "nopoll_helpers.h"
 #include "nopoll_handlers.h"
-#include "time.h"

 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */
@@ -34,10 +18,6 @@
 #define MAX_SEND_SIZE (60 * 1024)
 #define FLUSH_WAIT_TIME (2000000LL)

-struct timespec connStuck_start,connStuck_end;
-struct timespec *connStuck_startPtr = &connStuck_start;
-struct timespec *connStuck_endPtr = &connStuck_end;
-
 /*----------------------------------------------------------------------------*/
 /*                             External functions                             */
 /*----------------------------------------------------------------------------*/
@@ -54,11 +34,8 @@ void setMessageHandlers()
 void sendMessage(noPollConn *conn, void *msg, size_t len)
 {
    int bytesWritten = 0;
-    static int connErr=0;
-    long timeDiff = 0;

    ParodusInfo("sendMessage length %zu\n", len);
-
    if(nopoll_conn_is_ok(conn) && nopoll_conn_is_ready(conn))
    {
        //bytesWritten = nopoll_conn_send_binary(conn, msg, len);
@@ -68,30 +45,10 @@ void sendMessage(noPollConn *conn, void *msg, size_t 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);
-			}
-
-		}
+        ParodusError("Failed to send msg upstream as connection is not OK\n");
    }
 }

@@ -113,7 +70,7 @@ int sendResponse(noPollConn * conn, void * buffer, size_t length)
        {
            if (-1 == bytes_sent || (bytes_sent = nopoll_conn_flush_writes(conn, FLUSH_WAIT_TIME, bytes_sent)) != len_to_send)
            {
-                ParodusError("sendResponse() Failed to send all the data\n");
+                ParodusPrint("sendResponse() Failed to send all the data\n");
                cp = NULL;
                break;
            }
--- a/src/nopoll_helpers.h
+++ b/src/nopoll_helpers.h
@@ -1,24 +1,9 @@
-/**
- * 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 nopoll_handlers.h
 *
 * @description This header defines functions to manage incomming and outgoing messages.
 *
+ * Copyright (c) 2015  Comcast
 */

 #ifndef _NOPOLL_HELPERS_H_
--- a/src/parodus_log.h
+++ b/src/parodus_log.h
@@ -1,24 +1,9 @@
-/**
- * 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 parodus_log.h
 *
 * @description This header defines parodus log levels
 *
+ * Copyright (c) 2015  Comcast
 */
 
 #include <stdarg.h>
--- a/src/partners_check.c
+++ b/src/partners_check.c
@@ -1,24 +1,9 @@
-/**
- * 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 partners_check.c
 *
 * @description This describes functions to validate partner_id.
 *
+ * Copyright (c) 2015  Comcast
 */

 #include "ParodusInternal.h"
@@ -39,183 +24,85 @@
 /*----------------------------------------------------------------------------*/
 /*                             External functions                             */
 /*----------------------------------------------------------------------------*/
-static void parse_partner_id(char *partnerId, partners_t **partnersList)
-{
-    char *token;
-    int i = 0, j = 0, count = 0;
-    ParodusPrint("********* %s ********\n",__FUNCTION__);
-    while(partnerId[i] != '\0')
-    {
-        if(partnerId[i] == ',')
-        {
-            count++;
-        }
-        i++;
-    }
-    ParodusPrint("count = %d\n", count+1);
-    *partnersList = (partners_t *)malloc(sizeof(partners_t)+ sizeof( char * ) * (count+1));
-    memset(*partnersList, 0, sizeof(partners_t));
-    (*partnersList)->count = count+1;
-    while ((token = strsep(&partnerId, ",")) != NULL)
-    {
-        ParodusPrint("token=%s\n", token);
-        (*partnersList)->partner_ids[j] = strdup(token);
-        ParodusPrint("(*partnersList)->partner_ids[%d] = %s\n",j,(*partnersList)->partner_ids[j]);
-        j++;
-    }
-}
-
 int validate_partner_id(wrp_msg_t *msg, partners_t **partnerIds)
 {
    int matchFlag = 0, i = 0, count = 0;
-    size_t j = 0;
-    partners_t *partnersList = NULL;
-    char *partnerId = NULL;
    ParodusPrint("********* %s ********\n",__FUNCTION__);
-    char *temp = get_parodus_cfg()->partner_id;
-    ParodusPrint("temp = %s\n",temp);
-    if(temp[0] != '\0' && strlen(temp) > 0)
-    {
-        partnerId = strdup(temp);
-    }
-    ParodusPrint("partnerId = %s\n",partnerId);
-    if(partnerId != NULL)
-    {
-        parse_partner_id(partnerId, &partnersList);
-        ParodusPrint("partnersList->count = %lu\n", partnersList->count);
-        if(msg->msg_type == WRP_MSG_TYPE__EVENT)
-        {
-            if(msg->u.event.partner_ids != NULL)
-            {
-                count = (int) msg->u.event.partner_ids->count;
-                ParodusPrint("partner_ids count is %d\n",count);
-                for(i = 0; i < count; i++)
-                {
-                    for(j = 0; j<partnersList->count; j++)
-                    {
-			if(NULL != partnersList->partner_ids[j]) {
-		                ParodusPrint("partnersList->partner_ids[%lu] = %s\n",j, partnersList->partner_ids[j]);
-				ParodusPrint("msg->u.event.partner_ids->partner_ids[%lu] = %s\n",i, msg->u.event.partner_ids->partner_ids[i]);
-		                if(strcasecmp(partnersList->partner_ids[j], msg->u.event.partner_ids->partner_ids[i]) == 0)
-		                {
-		                    ParodusInfo("partner_id match found\n");
-		                    matchFlag = 1;
-		                    break;
-		                }
-			}
-			else
-				ParodusError("partner Id in partnersList is NULL but count is not 0");
-                    }
-                    /* Commandline input partner_ids matched with partner_ids from request */
-                    if(matchFlag == 1)
-                    {
-                        break;
-                    }
-                }
-
-                /* Commandline input partner_ids not matching with partner_ids from request, appending to request partner_ids*/
-                if(matchFlag != 1)
-                {
-                    (*partnerIds) = (partners_t *) malloc(sizeof(partners_t) + (sizeof(char *) * (count+partnersList->count)));
-                    (*partnerIds)->count = count+partnersList->count;
-                    for(i = 0; i < count; i++)
-                    {
-                        (*partnerIds)->partner_ids[i] = msg->u.event.partner_ids->partner_ids[i];
-                        ParodusPrint("(*partnerIds)->partner_ids[%d] : %s\n",i,(*partnerIds)->partner_ids[i]);
-                    }
-                    i = 0;
-                    for(j = count; j<(count+partnersList->count); j++)
-                    {
-                        (*partnerIds)->partner_ids[j] = (char *) malloc(sizeof(char) * 64);
-                        parStrncpy((*partnerIds)->partner_ids[j], partnersList->partner_ids[i], 64);
-                        ParodusPrint("(*partnerIds)->partner_ids[%lu] : %s\n",j,(*partnerIds)->partner_ids[j]);
-                        i++;
-                    }
-                }
-            }
-            else
-            {
-                ParodusPrint("partner_ids list is NULL\n");
-                (*partnerIds) = (partners_t *) malloc(sizeof(partners_t) + (sizeof(char *) * partnersList->count));
-                (*partnerIds)->count = partnersList->count;
-                i=0;
-                for(j = 0; j<partnersList->count; j++)
-                {
-                    (*partnerIds)->partner_ids[j] = (char *) malloc(sizeof(char) * 64);
-                    parStrncpy((*partnerIds)->partner_ids[j], partnersList->partner_ids[i], 64);
-                    ParodusPrint("(*partnerIds)->partner_ids[%lu] : %s\n",j,(*partnerIds)->partner_ids[j]);
-                    i++;
-                }
-            }
-        }
-        else if(msg->msg_type == WRP_MSG_TYPE__REQ)
-        {
-            if(msg->u.req.partner_ids != NULL)
-            {
-                count = (int) msg->u.req.partner_ids->count;
-                ParodusPrint("partner_ids count is %d\n",count);
-                for(i = 0; i < count; i++)
-                {
-                    for(j = 0; j<partnersList->count; j++)
-                    {
-			if(NULL != partnersList->partner_ids[j]) 
-			{
-		                ParodusPrint("partnersList->partner_ids[%lu] = %s\n",j, partnersList->partner_ids[j]);
-				ParodusPrint("msg->u.req.partner_ids->partner_ids[%lu] = %s\n",i, msg->u.req.partner_ids->partner_ids[i]);
-		                if(strcasecmp(partnersList->partner_ids[j], msg->u.req.partner_ids->partner_ids[i]) == 0)
-		                {
-		                    ParodusInfo("partner_id match found\n");
-		                    matchFlag = 1;
-		                    break;
-		                }
-			}
-			else
-				ParodusError("partner Id in partnersList is NULL but count is not 0");
-                    }
-                }
-
-                /* Commandline input partner_ids not matching with partner_ids from request, ignoring request*/
-                if(matchFlag != 1)
-                {
-                    ParodusError("Invalid partner_id %s\n",temp);
-                    if(partnersList != NULL)
-                    {
-                        for(j=0; j<partnersList->count; j++)
-                        {
-                            if(NULL != partnersList->partner_ids[j])
-                            {
-                                free(partnersList->partner_ids[j]);
-                            }
-                        }
-                        free(partnersList);
-                    }
-                    free(partnerId);
-                    return -1;
-                }
-            }
-            else
-            {
-                ParodusPrint("partner_ids list is NULL\n");
-            }
-        }
-        if(partnersList != NULL)
-        {
-            for(j=0; j<partnersList->count; j++)
-            {
-                if(NULL != partnersList->partner_ids[j])
-                {
-                    free(partnersList->partner_ids[j]);
-                }
-            }
-            free(partnersList);
-        }
-        free(partnerId);
-    }
-    else
+    char *partnerId = get_parodus_cfg()->partner_id;
+    if(strlen(partnerId) <= 0)
    {
        ParodusPrint("partner_id is not available to validate\n");
        return 0;
    }
+    
+    if(msg->msg_type == WRP_MSG_TYPE__EVENT)
+    {
+        if(msg->u.event.partner_ids != NULL)
+        {
+            count = (int) msg->u.event.partner_ids->count;
+            ParodusPrint("partner_ids count is %d\n",count);
+            for(i = 0; i < count; i++)
+            {
+                if(strcmp(partnerId, msg->u.event.partner_ids->partner_ids[i]) == 0)
+                {
+                    ParodusInfo("partner_id match found\n");
+                    matchFlag = 1;
+                    break;
+                }
+            }
+            
+            if(matchFlag != 1)
+            {
+                (*partnerIds) = (partners_t *) malloc(sizeof(partners_t));
+                (*partnerIds)->count = count+1;
+                for(i = 0; i < count; i++)
+                {
+                    (*partnerIds)->partner_ids[i] = msg->u.event.partner_ids->partner_ids[i];
+                    ParodusPrint("(*partnerIds)->partner_ids[%d] : %s\n",i,(*partnerIds)->partner_ids[i]);
+                }
+                (*partnerIds)->partner_ids[count] = (char *) malloc(sizeof(char) * 64);
+                strcpy((*partnerIds)->partner_ids[count], partnerId);
+                ParodusPrint("(*partnerIds)->partner_ids[%d] : %s\n",count,(*partnerIds)->partner_ids[count]);
+            }
+        }
+        else
+        {
+            ParodusPrint("partner_ids list is NULL\n");
+            (*partnerIds) = (partners_t *) malloc(sizeof(partners_t));
+            (*partnerIds)->count = 1;
+            (*partnerIds)->partner_ids[0] = (char *) malloc(sizeof(char) * 64);
+            strcpy((*partnerIds)->partner_ids[0], partnerId);
+            ParodusPrint("(*partnerIds)->partner_ids[0] : %s\n",(*partnerIds)->partner_ids[0]);
+        }
+    }
+    else if(msg->msg_type == WRP_MSG_TYPE__REQ)
+    {
+        if(msg->u.req.partner_ids != NULL)
+        {
+            count = (int) msg->u.req.partner_ids->count;
+            ParodusPrint("partner_ids count is %d\n",count);
+            for(i = 0; i < count; i++)
+            {
+                if(strcmp(partnerId, msg->u.req.partner_ids->partner_ids[i]) == 0)
+                {
+                    ParodusInfo("partner_id match found\n");
+                    matchFlag = 1;
+                    break;
+                }
+            }
+
+            if(matchFlag != 1)
+            {
+                ParodusError("Invalid partner_id %s\n",partnerId);
+                return -1;
+            }
+        }
+        else
+        {
+            ParodusPrint("partner_ids list is NULL\n");
+        }
+    }
+    
    return 1;
 }

--- a/src/partners_check.h
+++ b/src/partners_check.h
@@ -1,24 +1,9 @@
-/**
- * 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 partners_check.h
 *
 * @description This describes functions to validate partner_id.
 *
+ * Copyright (c) 2015  Comcast
 */
 
 #ifndef _PARTNERS_CHECK_H_
--- a/src/service_alive.c
+++ b/src/service_alive.c
@@ -1,24 +1,9 @@
-/**
- * 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 service_alive.c
 *
 * @description This file is used to manage keep alive section
 *
+ * Copyright (c) 2015  Comcast
 */

 #include "ParodusInternal.h"
@@ -31,41 +16,9 @@
 /*----------------------------------------------------------------------------*/
 #define KEEPALIVE_INTERVAL_SEC                         	30

-pthread_mutex_t svc_mut=PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t svc_con=PTHREAD_COND_INITIALIZER;
-
-/*----------------------------------------------------------------------------*/
-/*                             Utiliy Functions                               */
-/*----------------------------------------------------------------------------*/
-static int wait__ (unsigned int secs)
-{
-  int shutdown_flag;
-  struct timespec svc_alive_timer;
-
-  clock_gettime(CLOCK_REALTIME, &svc_alive_timer);
-  svc_alive_timer.tv_sec += secs;
-  pthread_mutex_lock(&svc_mut);
-  pthread_cond_timedwait (&svc_con, &svc_mut, &svc_alive_timer);
-  shutdown_flag = g_shutdown;
-  pthread_mutex_unlock (&svc_mut);
-  return shutdown_flag;
-}
-
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
-
-pthread_cond_t *get_global_svc_con(void)
-{
-    return &svc_con;
-}
-
-pthread_mutex_t *get_global_svc_mut(void)
-{
-    return &svc_mut;
-}
-
-
 /*
 * @brief To handle registered services to indicate that the service is still alive.
 */
@@ -90,10 +43,10 @@ void *serviceAliveTask()
 	        while(1)
 	        {
 		        ParodusPrint("serviceAliveTask: numOfClients registered is %d\n", get_numOfClients());
-		        temp = get_global_node();
 		        if(get_numOfClients() > 0)
 		        {
 			        //sending svc msg to all the clients every 30s
+			        temp = get_global_node();
 			        size = (size_t) nbytes;
 			        while(NULL != temp)
 			        {
@@ -123,20 +76,15 @@ void *serviceAliveTask()
 					        temp= temp->next;
 				        }
 			        }
-				release_global_node ();
 		         	ParodusPrint("Waiting for 30s to send keep alive msg \n");
-		         	if (wait__ (KEEPALIVE_INTERVAL_SEC))
-				  break;
+		         	sleep(KEEPALIVE_INTERVAL_SEC);
 	            	}
 	            	else
 	            	{
-				release_global_node ();
 	            		ParodusInfo("No clients are registered, waiting ..\n");
-	            		if (wait__ (50))
-				  break;
+	            		sleep(70);
 	            	}
 	        }
-		free (svc_bytes);
 	}
 	return 0;
 }
--- a/src/service_alive.h
+++ b/src/service_alive.h
@@ -1,31 +1,14 @@
-/**
- * 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 service_alive.h
 *
 * @description This file is used to manage keep alive section
 *
+ * Copyright (c) 2015  Comcast
 */
 
 #ifndef _SERVICE_ALIVE_H_
 #define _SERVICE_ALIVE_H_

-#include <pthread.h>
-
 /*----------------------------------------------------------------------------*/
 /*                             Function Prototypes                            */
 /*----------------------------------------------------------------------------*/
@@ -35,8 +18,7 @@ extern "C" {
 #endif
  
 void *serviceAliveTask();
-pthread_cond_t *get_global_svc_con(void);
-pthread_mutex_t *get_global_svc_mut(void);
+

 #ifdef __cplusplus
 }
--- a/src/seshat_interface.c
+++ b/src/seshat_interface.c
@@ -1,81 +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 seshat_interface.c
- *
- * @description This decribes interface to register seshat service.
- *
- */
- 
-#include "seshat_interface.h"
-#include "ParodusInternal.h"
-#include "config.h"
-#include <libseshat.h>
-
-/*----------------------------------------------------------------------------*/
-/*                                   Macros                                   */
-/*----------------------------------------------------------------------------*/
-#define SESHAT_SERVICE_NAME                             "Parodus"
-/*----------------------------------------------------------------------------*/
-/*                            File Scoped Variables                           */
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/*                             Function Prototypes                            */
-/*----------------------------------------------------------------------------*/
-
-
-/*----------------------------------------------------------------------------*/
-/*                             Internal Functions                             */
-/*----------------------------------------------------------------------------*/
-
-
-/*----------------------------------------------------------------------------*/
-/*                             External functions                             */
-/*----------------------------------------------------------------------------*/
-
-bool __registerWithSeshat()
-{
-    char *seshat_url = get_parodus_cfg()->seshat_url;
-    char *parodus_url = get_parodus_cfg()->local_url;
-    char *discover_url = NULL;
-    bool rv = false;
-
-    if( 0 == init_lib_seshat(seshat_url) ) {
-        ParodusInfo("seshatlib initialized! (url %s)\n", seshat_url);
-
-        if( 0 == seshat_register(SESHAT_SERVICE_NAME, parodus_url) ) {
-            ParodusInfo("seshatlib registered! (url %s)\n", parodus_url);
-
-            discover_url = seshat_discover(SESHAT_SERVICE_NAME);
-            if( (NULL != discover_url) && (0 == strcmp(parodus_url, discover_url)) ) {
-                ParodusInfo("seshatlib discovered url = %s\n", discover_url);
-                rv = true;
-            } else {
-                ParodusError("seshatlib registration error (url %s)!", discover_url);
-            }
-            free(discover_url);
-        } else {
-            ParodusError("seshatlib not registered! (url %s)\n", parodus_url);
-        }
-    } else {
-        ParodusPrint("seshatlib not initialized! (url %s)\n", seshat_url);
-    }
-
-    shutdown_seshat_lib();
-    return rv;
-}
--- a/src/seshat_interface.h
+++ b/src/seshat_interface.h
@@ -1,54 +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 seshat_interface.h
- *
- * @description This header defines interface to register seshat service.
- *
- */
- 
-#ifndef _SESHAT_INTERFACE_H_
-#define _SESHAT_INTERFACE_H_
-
-#include <stdbool.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*----------------------------------------------------------------------------*/
-/*                            File Scoped Variables                           */
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/*                             Function Prototypes                            */
-/*----------------------------------------------------------------------------*/
-
-/**
- * @brief Helper function to register with seshat.
- * 
- * @note return whether successfully registered.
- *
- * @return true when registered, false otherwise.
- */
-bool __registerWithSeshat();
-   
-#ifdef __cplusplus
-}
-#endif
-    
-#endif
--- a/src/seshat_interface_stub.c
+++ b/src/seshat_interface_stub.c
@@ -1,53 +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 seshat_interface_stub.c
- *
- * @description This decribes interface to register seshat service
- *
- */
- 
-#include "seshat_interface.h"
-#include "ParodusInternal.h"
-
-/*----------------------------------------------------------------------------*/
-/*                                   Macros                                   */
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/*                            File Scoped Variables                           */
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/*                             Function Prototypes                            */
-/*----------------------------------------------------------------------------*/
-
-
-/*----------------------------------------------------------------------------*/
-/*                             Internal Functions                             */
-/*----------------------------------------------------------------------------*/
-
-
-/*----------------------------------------------------------------------------*/
-/*                             External functions                             */
-/*----------------------------------------------------------------------------*/
-
-bool __registerWithSeshat()
-{
-    ParodusInfo("libseshat disabled, Hence proceeding without registration\n");
-    return true;
-}
--- a/src/spin_thread.c
+++ b/src/spin_thread.c
@@ -1,28 +1,14 @@
-/**
- * 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 spin_thread.c
 *
 * @description This file is used to define thread function
 *
+ * Copyright (c) 2015  Comcast
 */
 
 #include <stdlib.h>
 #include <string.h>
+#include <pthread.h>

 #include "spin_thread.h"
 #include "parodus_log.h"
@@ -30,12 +16,12 @@
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
-void StartThread(void *(*start_routine) (void *), pthread_t *threadId)
+void StartThread(void *(*start_routine) (void *))
 {
    int err = 0;
-	pthread_t __threadId;
+	pthread_t threadId;

-	err = pthread_create(&__threadId, NULL, start_routine, NULL);
+	err = pthread_create(&threadId, NULL, start_routine, NULL);
 	if (err != 0) 
 	{
 		ParodusError("Error creating thread :[%s]\n", strerror(err));
@@ -43,13 +29,8 @@ void StartThread(void *(*start_routine) (void *), pthread_t *threadId)
 	}
 	else
 	{
-		*threadId = __threadId;
-		ParodusPrint("Thread created Successfully %lu\n", (unsigned long) __threadId);
+		ParodusPrint("Thread created Successfully %d\n", (int ) threadId);
 	}    
 }

-
-void JoinThread (pthread_t threadId)
-{
-  pthread_join (threadId, NULL);
-}
+         
--- a/src/spin_thread.h
+++ b/src/spin_thread.h
@@ -1,31 +1,14 @@
-/**
- * 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 spin_thread.h
 *
 * @description This file is used to define thread function
 *
+ * Copyright (c) 2015  Comcast
 */
 
 #ifndef _SPIN_THREAD_H_
 #define _SPIN_THREAD_H_

-#include <pthread.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -34,8 +17,8 @@ extern "C" {
 /*                             Function Prototypes                            */
 /*----------------------------------------------------------------------------*/

-void StartThread(void *(*start_routine) (void *), pthread_t *threadId);
-void JoinThread (pthread_t threadId);
+void StartThread(void *(*start_routine) (void *));
+

 #ifdef __cplusplus
 }
--- a/src/thread_tasks.c
+++ b/src/thread_tasks.c
@@ -43,10 +43,6 @@ void *messageHandlerTask()
        }
        else
        {
-            if (g_shutdown) {
-                pthread_mutex_unlock (&g_mutex);
-                break;
-            }
            ParodusPrint("Before pthread cond wait in consumer thread\n");
            pthread_cond_wait(&g_cond, &g_mutex);
            pthread_mutex_unlock (&g_mutex);
--- a/src/thread_tasks.h
+++ b/src/thread_tasks.h
@@ -1,24 +1,9 @@
-/**
- * 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 thread_tasks.h
 *
 * @description This header defines thread functions.
 *
+ * Copyright (c) 2015  Comcast
 */
 
 #ifndef _THREAD_TASKS_H_
--- a/src/token.c
+++ b/src/token.c
@@ -1,546 +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 token.c
- *
- * @description This file contains operations for using jwt token.
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <unistd.h>
-#include <netinet/in.h>
-#ifdef FEATURE_DNS_QUERY
-#include <ucresolv.h>
-#endif
-//#include <res_update.h>
-#include <netdb.h>
-#include <strings.h>
-#include <string.h>
-
-#include <assert.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <errno.h>
-#include <time.h>
-
-#include <cjwt/cjwt.h>
-#include "token.h"
-#include "config.h"
-#include "parodus_log.h"
-#include "ParodusInternal.h"
-
-#define JWT_MAXBUF	8192
-
-#ifdef NS_MAXMSG
-#if NS_MAXMSG > JWT_MAXBUF
-#define NS_MAXBUF JWT_MAXBUF
-#else
-#define NS_MAXBUF NS_MAXMSG
-#endif
-#else
-#define NS_MAXBUF JWT_MAXBUF
-#endif
-
-#define TXT_REC_ID_MAXSIZE	128
-
-#define MAX_RR_RECS 10
-#define SEQ_TABLE_SIZE (MAX_RR_RECS + 1)
-
-/*----------------------------------------------------------------------------*/
-/*                                   Macros                                   */
-/*----------------------------------------------------------------------------*/
-#define ENDPOINT_NAME "endpoint"
-
-/*----------------------------------------------------------------------------*/
-/*                            File Scoped Variables                           */
-/*----------------------------------------------------------------------------*/
-/* none */
-
-/*----------------------------------------------------------------------------*/
-/*                             Function Prototypes                            */
-/*----------------------------------------------------------------------------*/
-/* none */
-
-/*----------------------------------------------------------------------------*/
-/*                             External Functions                             */
-/*----------------------------------------------------------------------------*/
-#ifdef FEATURE_DNS_QUERY
-
-extern int __res_ninit(res_state statp);
-extern void __res_nclose(res_state statp);
-extern int __res_nquery(res_state statp,
-	   const char *name,	/* domain name */
-	   int class, int type,	/* class and type of query */
-	   u_char *answer,	/* buffer to put answer */
-	   int anslen);		/* size of answer buffer */
-
-/*----------------------------------------------------------------------------*/
-/*                             Internal functions                             */
-/*----------------------------------------------------------------------------*/
-
-
-static void show_times (time_t exp_time, time_t cur_time)
-{
-	char exp_buf[30];
-	char cur_buf[30];
-	ctime_r (&exp_time, exp_buf);
-	exp_buf[strlen(exp_buf)-1] = 0;
-	ctime_r (&cur_time, cur_buf);
-	cur_buf[strlen(cur_buf)-1] = 0;
-	ParodusInfo ("Exp: %d %s, Current: %d %s\n", 
-		(int)exp_time, exp_buf+4, (int)cur_time, cur_buf+4);
-}
-
-// returns 1 if insecure, 0 if secure, < 0 if error
-int analyze_jwt (const cjwt_t *jwt, char **url_buf, unsigned int *port)
-{
-	cJSON *claims = jwt->private_claims;
-	cJSON *endpoint = NULL;
-	time_t exp_time, cur_time;
-	int http_match;
-
-	if (!claims) {
-		ParodusError ("Private claims not found in jwt\n");
-		return TOKEN_ERR_INVALID_JWT_CONTENT;
-	}
-
-	endpoint = cJSON_GetObjectItem(claims, ENDPOINT_NAME);
-	if (!endpoint) {
-		ParodusError ("Endpoint claim not found in jwt\n");
-		return TOKEN_ERR_INVALID_JWT_CONTENT;
-	}
-
-	ParodusInfo ("JWT endpoint: %s\n", endpoint->valuestring);
-	exp_time = jwt->exp.tv_sec;
-	if (0 == exp_time) {
-		ParodusError ("exp not found in JWT payload\n");
-		return TOKEN_ERR_NO_EXPIRATION;
-	} else {
-		cur_time = time(NULL);
-		show_times (exp_time, cur_time);
-		if (exp_time < cur_time) {
-			ParodusError ("JWT has expired\n");
-			return TOKEN_ERR_JWT_EXPIRED;
-		}
-	}
-	http_match = parse_webpa_url (endpoint->valuestring,
-		url_buf, port);
-	if (http_match < 0) {
-		ParodusError ("Invalid endpoint claim in JWT\n");
-		return TOKEN_ERR_BAD_ENDPOINT;
-	}
-	ParodusInfo ("JWT is_http strncmp: %d\n", http_match);
-
-	return http_match;
-}
-
-bool validate_algo(const cjwt_t *jwt)
-{
-	// return true if jwt->header.alg is included in the set
-	// of allowed algorithms specified by cfg->jwt_algo
-	ParodusCfg *cfg = get_parodus_cfg();
-        int alg = jwt->header.alg;
-        int alg_mask;
-
-	if ((alg < 0) || (alg >= num_algorithms))
-		return false;
-	alg_mask = 1<<alg;
-	if ((alg_mask & cfg->jwt_algo) == 0) {
-		ParodusError ("Algorithm %d not allowed (mask %d)\n", alg, alg_mask); 
-		return false;
-	}
-	return true;
-}
-
-
-int nquery(const char* dns_txt_record_id, u_char *nsbuf)
-{
-	
-    int len;
-    struct __res_state statp;
-
-    /* Initialize resolver */
-		memset (&statp, 0, sizeof(__res_state));
-		if (NULL == nsbuf) {
-			ParodusError ("nquery: nsbuf is NULL\n");
-			return (-1);
-		}
-		statp.options = RES_DEBUG;
-    if (__res_ninit(&statp) < 0) {
-        ParodusError ("res_ninit error: can't initialize statp.\n");
-        return (-1);
-    }
-
-		ParodusInfo ("nquery: domain : %s\n", dns_txt_record_id);
-		memset (nsbuf, 0, NS_MAXBUF);
-		len = __res_nquery(&statp, dns_txt_record_id, ns_c_in, ns_t_txt, nsbuf, NS_MAXBUF);
-    if (len < 0) {
-				if (0 != statp.res_h_errno) {
-					const char *msg = hstrerror (statp.res_h_errno);
-        	ParodusError ("Error in res_nquery: %s\n", msg);
-				}
-        return len;
-    }
-    __res_nclose (&statp);
-	ParodusInfo ("nquery: nsbuf (1) 0x%lx\n", (unsigned long) nsbuf);
-    if (len >= NS_MAXBUF) {
-        ParodusError ("res_nquery error: ns buffer too small.\n");
-        return -1;
-    }
-
-    return len;
-
-}
-
-bool valid_b64_char (char c)
-{
-	if ((c>='A') && (c<='Z'))
-		return true;
-	if ((c>='a') && (c<='z'))
-		return true;
-	if ((c>='0') && (c<='9'))
-		return true;
-  if ((c=='/') || (c=='+') || (c=='-') || (c=='_'))
-		return true;
-	return false;
-}
-
-static bool is_digit (char c)
-{
-	return (bool) ((c>='0') && (c<='9'));
-}
-
-// strip quotes and newlines from rr rec
-const char *strip_rr_data (const char *rr_ptr, int *rrlen)
-{
-	int len = *rrlen;
-	const char *optr = rr_ptr;
-	char c;
-
-	if (len > 0) {
-		c = optr[0];
-		if (!is_digit(c)) {
-			optr++;
-			len--;
-		}
-	}
-	if (len > 0) {
-		if (!valid_b64_char (optr[len-1]))
-			len--;
-	}
-	if (len > 0) {
-		if (!valid_b64_char (optr[len-1]))
-			len--;
-	}
-	*rrlen = len;
-	return optr;
-}
-
-// return offset to seq number in record
-// return -1 if not found, -2 if invalid fmt
-int find_seq_num (const char *rr_ptr, int rrlen)
-{
-	char c;
-	int i;
-	int digit_ct = 0;
-
-	for (i=0; i<rrlen; i++)
-	{
-		c = rr_ptr[i];
-		if (c == ':') {
-			if (digit_ct >= 2)
-				return i - 2;
-			else
-				return -2;
-		}
-		if (is_digit (c))
-			digit_ct++;
-		else
-			digit_ct = 0;
-	}
-	return -1;		
-}
-
-// get seq num in rr rec
-// return -1 if not formatted correctly
-int get_rr_seq_num (const char *rr_ptr, int rrlen)
-{
-	char c;
-	int lo, hi;
-	if (rrlen < 3)
-		return -1;
-	if (rr_ptr[2] != ':')
-		return -1;
-	c = rr_ptr[0];
-	if (is_digit (c))
-		hi = c - '0';
-	else
-		return -1;
-	c = rr_ptr[1];
-	if (is_digit (c))
-		lo = c - '0';
-	else
-		return -1;
-	return (10*hi) + lo;
-}
-
-// scan rr recs and build seq table using seq numbers in the recs
-// return num_txt_recs
-int get_rr_seq_table (ns_msg *msg_handle, int num_rr_recs, rr_rec_t *seq_table)
-{
-	ns_rr rr;
-	const char *rr_ptr;
-	int seq_pos;
-	int rrlen;
-	int i, ret, seq_num;
-	int num_txt_recs = 0;
-
-	if (num_rr_recs > MAX_RR_RECS) {
-		ParodusError ("num rr recs (%d) to big, > %d\n", num_rr_recs, MAX_RR_RECS);
-		return -1;
-	}
-	// clear seq table
-	for (i=0; i<SEQ_TABLE_SIZE; i++)
-	{
-		seq_table[i].rr_ptr = NULL;
-		seq_table[i].rr_len = 0;
-	}
-
-	// extract and concatenate all the records in rr
-	for (i=0; i<num_rr_recs; i++) {
-		ret = ns_parserr(msg_handle, ns_s_an, i, &rr);
-		if (ret != 0) {
-			ParodusError ("query_dns: ns_parserr failed: %s\n", strerror (errno));
-			return ret;
-		}
-		if (ns_rr_type(rr) != ns_t_txt)
-    	continue;
-		++num_txt_recs;
-    rr_ptr = (const char *)ns_rr_rdata(rr);
-    rrlen = ns_rr_rdlen(rr);
-		ParodusPrint ("Found rr rec type %d: %s\n", ns_t_txt, rr_ptr);
-		rr_ptr = strip_rr_data (rr_ptr, &rrlen);		
-		seq_pos = find_seq_num (rr_ptr, rrlen);
-		if (seq_pos == -2) {
-			ParodusError ("Invalid seq number in rr record %d\n", i);
-			return -1;
-		}
-		if (seq_pos < 0) {
-			seq_num = 0;
-		} else {
-			rr_ptr += seq_pos;
-			rrlen -= seq_pos;
-			seq_num = get_rr_seq_num (rr_ptr, rrlen);
-		}
-		ParodusPrint ("Found seq num %d in rr rec %d\n", seq_num, i);
-
-		if (seq_num < 0) {
-			ParodusError ("Seq number not found in rr record %d\n", i);
-			return -1;
-		}
-		if (seq_num > num_rr_recs) {
-			ParodusError ("Invalid seq number (too big) in rr record %d\n", i);
-			return -1;
-		}
-		if (NULL != seq_table[seq_num].rr_ptr) {
-			ParodusError ("Duplicate rr record number %d\n", seq_num);
-			return -1;
-		}
-		if (seq_num != 0) {
-			rr_ptr += 3; // skip the seq number
-			rrlen -= 3;
-		}
-		seq_table[seq_num].rr_ptr = rr_ptr;
-		seq_table[seq_num].rr_len = rrlen;
-	}
-
-	if (NULL != seq_table[0].rr_ptr) {
-		// sequence-less record should not be used when there
-		// are multiple records
-		if (num_txt_recs > 1) {
-			ParodusError ("Seq number not found in rr record\n");
-			return -1;
-		}
-		// when there is only one record, use the sequence-less record
-		seq_table[1].rr_ptr = seq_table[0].rr_ptr;
-		seq_table[1].rr_len = seq_table[0].rr_len;
-	}
-
-	// check if we got them all
-	for (i=1; i<num_txt_recs; i++) {
-		if (NULL == seq_table[i].rr_ptr) {
-			ParodusError ("Missing rr record number %d\n", i+1);
-			return -1;
-		}
-	}
-	return num_txt_recs;
-}
-
-int assemble_jwt_from_dns (ns_msg *msg_handle, int num_rr_recs, char *jwt_ans)
-{
-	// slot 0 in the seq table is for the sequence-less record that
-	// you get when there is only one record.
-	rr_rec_t seq_table[SEQ_TABLE_SIZE];
-	int i;
-	int num_txt_recs = get_rr_seq_table (msg_handle, num_rr_recs, seq_table);
-
-	if (num_txt_recs < 0)
-		return num_txt_recs;
-	ParodusPrint ("Found %d TXT records\n", num_txt_recs);
-	jwt_ans[0] = 0;
-	for (i=1; i<=num_txt_recs; i++)
-		strncat (jwt_ans, seq_table[i].rr_ptr, seq_table[i].rr_len);
-	return 0;
-}
-
-int query_dns(const char* dns_txt_record_id,char *jwt_ans)
-{
-	u_char *nsbuf;
-	ns_msg msg_handle;
-	int ret;
-	int l = -1;
-	
-	if( !dns_txt_record_id || !jwt_ans )
-		return l;
-   
-	nsbuf = (u_char *) malloc (NS_MAXBUF);
-	ParodusInfo ("nsbuf (1) 0x%lx\n", (unsigned long) nsbuf);
-	if (NULL == nsbuf) {
-		ParodusError ("Unable to allocate nsbuf in query_dns\n");
-		return TOKEN_ERR_MEMORY_FAIL;
-	}
-	
-	l = nquery(dns_txt_record_id,nsbuf);
-	if (l < 0) {
-		ParodusError("nquery returns error: l value is %d\n", l);
-		free (nsbuf);
-		return l;
-	}
-	ParodusInfo ("nsbuf (2) 0x%lx\n", (unsigned long) nsbuf);
-
-/*--
-	memset((void *) &msg_handle, 0x5e, sizeof (ns_msg));
-	ParodusInfo ("nsbuf (3) 0x%lx\n", (unsigned long) nsbuf);
-	msg_handle._msg = nsbuf;
-*/
-	ParodusInfo ("ns_initparse, msglen %d, nsbuf 0x%lx\n",
-    l, (unsigned long) nsbuf);
-	ret = ns_initparse((const u_char *) nsbuf, l, &msg_handle);
-	if (ret != 0) {
-		ParodusError ("ns_initparse failed\n");
-		free (nsbuf);
-		return ret;
-	}
-	
-	ParodusInfo ("ns_msg_count\n");
-	l = ns_msg_count(msg_handle, ns_s_an);
-	ParodusInfo ("query_dns: ns_msg_count : %d\n",l);
-  jwt_ans[0] = 0;
-	
-	ret = assemble_jwt_from_dns (&msg_handle, l, jwt_ans);
-	free (nsbuf);
-	if (ret == 0)
-		ParodusInfo ("query_dns JWT: %s\n", jwt_ans);
-	return ret;
-}
-
-static void get_dns_txt_record_id (char *buf)
-{
-	ParodusCfg *cfg = get_parodus_cfg();
-	buf[0] = 0;
-
-	sprintf (buf, "%s.%s", cfg->hw_mac, cfg->dns_txt_url);
-	ParodusInfo("dns_txt_record_id %s\n", buf);
-}
-#endif
-
-int allow_insecure_conn(char **server_addr, unsigned int *port)
-{
-#ifdef FEATURE_DNS_QUERY	
-	int insecure=0, ret = -1;
-	char *jwt_token, *key;
-	cjwt_t *jwt = NULL;
-	char dns_txt_record_id[TXT_REC_ID_MAXSIZE];
-	
-	jwt_token = malloc (NS_MAXBUF);
-	if (NULL == jwt_token) {
-		ParodusError ("Unable to allocate jwt_token in allow_insecure_conn\n");
-		insecure = TOKEN_ERR_MEMORY_FAIL;
-		goto end;
-	}
-
-	get_dns_txt_record_id (dns_txt_record_id);
-	
-	ret = query_dns(dns_txt_record_id, jwt_token);
-	ParodusPrint("query_dns returns %d\n", ret);
-		
-	if(ret){
-		ParodusError("Failed in DNS query\n");
-		if (ret == TOKEN_ERR_MEMORY_FAIL){
-			insecure = ret;
-		} 
-		else{
-			insecure = TOKEN_ERR_QUERY_DNS_FAIL;
-		}
-		goto end;
-	}
-	//Decoding the jwt token
-	key = get_parodus_cfg()->jwt_key;
-	ret = cjwt_decode( jwt_token, 0, &jwt, ( const uint8_t * )key,strlen(key) );
-
-	if(ret) {
-		if (ret == ENOMEM) {
-			ParodusError ("Memory allocation failed in JWT decode\n");
-		} else {
-			ParodusError ("CJWT decode error\n");
-		}
-		insecure = TOKEN_ERR_JWT_DECODE_FAIL;
-		goto end;
-	}
-
-	ParodusPrint("Decoded CJWT successfully\n");
-
-	//validate algo from --jwt_algo
-	if( validate_algo(jwt) ) {
-		insecure = analyze_jwt (jwt, server_addr, port);
-	} else {
-		insecure = TOKEN_ERR_ALGO_NOT_ALLOWED;
-	}
-
-	if (insecure >= 0) {
-		char *claim_str = cJSON_Print (jwt->private_claims);
-		ParodusInfo ("JWT claims: %s\n", claim_str);
-		free (claim_str);
-	}
-	cjwt_destroy(&jwt);
-	
-end:
-	if (NULL != jwt_token)
-		free (jwt_token);
-#else
-  (void) server_addr;
-  (void) port;
-  int insecure = TOKEN_NO_DNS_QUERY;
-#endif
-	ParodusPrint ("Allow Insecure %d\n", insecure);
-	return insecure;
-}
--- a/src/token.h
+++ b/src/token.h
@@ -1,90 +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 token.h
- *
- * @description This file contains apis and error codes for using jwt token.
- *
- */
-
-#ifndef _TOKEN_H_
-#define _TOKEN_H_
-
-/** 
- * @brief token error rtn codes
- * 
- */
-typedef enum {
-	TOKEN_ERR_MEMORY_FAIL = -999,
-	TOKEN_ERR_QUERY_DNS_FAIL = -101,
-	TOKEN_ERR_JWT_DECODE_FAIL = -102,
-	TOKEN_ERR_ALGO_NOT_ALLOWED = -103,
-	TOKEN_ERR_INVALID_JWT_CONTENT = -104,
-	TOKEN_ERR_NO_EXPIRATION = -105,
-	TOKEN_ERR_JWT_EXPIRED = -106,
-	TOKEN_ERR_BAD_ENDPOINT = -107,
-	TOKEN_NO_DNS_QUERY = -1
-} token_error_t;
-
-
-/**
-
-Connection Logic:
-
----- Criteria  -----
-
-Feature					FeatureDnsQuery enabled
-QueryGood				Dns query succeeds, jwt decodes and is valid and unexpired
-Endpt starts		Endpoint specified in the jwt starts with http:// or https://
-Config Secflag	secureFlag in config is set.  Currently always set.
-
-
----- Actions -----
-
-Default			Securely connect to the default URL, specified
-						in the config
-Secure			Securely connect to the endpoint given in the jwt
-Insecure		Insecurely connect to the endpoint given in the jwt
-
- 
----- Logic Table -----
-
-Feature		Query		Endpt		Config			Action
-			Good		Claim		SecFlag
-
-No													Default
-Yes			No										Default
-Yes			Yes			https						Secure
-Yes			Yes			http		False			Insecure
-Yes			Yes			http		True			Default
-*/
-
-
-/**
- * query the dns server, obtain a jwt, determine if insecure
- * connections can be allowed. 
- *
- * @param server_addr	ptr to buffer ptr containing endpoint value found in JWT
- *                      will be NULL if invalid, otherwise needs to be freed
- * @param port 		ptr to variable receiving the port number
- * @return 1 if insecure connection is allowed, 0 if not,
-*    or one of the error codes given above. 
-*/ 
-int allow_insecure_conn (char **server_addr, unsigned int *port);
-
-
-#endif
--- a/src/token_stub.c
+++ b/src/token_stub.c
@@ -1,52 +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 token_stub.c
- *
- * @description This file contains operations for using jwt token.
- *
- */
-#include "token.h"
-#include "parodus_log.h"
-
-/*----------------------------------------------------------------------------*/
-/*                                   Macros                                   */
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/*                            File Scoped Variables                           */
-/*----------------------------------------------------------------------------*/
-/* none */
-
-/*----------------------------------------------------------------------------*/
-/*                             Function Prototypes                            */
-/*----------------------------------------------------------------------------*/
-/* none */
-
-/*----------------------------------------------------------------------------*/
-/*                             External Functions                             */
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/*                             Internal functions                             */
-/*----------------------------------------------------------------------------*/
-
-int allow_insecure_conn(void)
-{
-        ParodusInfo("CJWT is disabled, Hence proceeding without validation\n");	
-	return 1;
-}
--- a/src/upstream.c
+++ b/src/upstream.c
@@ -1,24 +1,9 @@
-/**
- * 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 upstream.c
 *
 * @description This describes functions required to manage upstream messages.
 *
+ * Copyright (c) 2015  Comcast
 */

 #include "ParodusInternal.h"
@@ -28,13 +13,12 @@
 #include "connection.h"
 #include "client_list.h"
 #include "nopoll_helpers.h"
-#include "close_retry.h"

 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */
 /*----------------------------------------------------------------------------*/
 #define METADATA_COUNT 					12
-#define PARODUS_SERVICE_NAME			"parodus"
+
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
@@ -49,26 +33,6 @@ pthread_mutex_t nano_mut=PTHREAD_MUTEX_INITIALIZER;

 pthread_cond_t nano_con=PTHREAD_COND_INITIALIZER;

-UpStreamMsg * get_global_UpStreamMsgQ(void)
-{
-    return UpStreamMsgQ;
-}
-
-void set_global_UpStreamMsgQ(UpStreamMsg * UpStreamQ)
-{
-    UpStreamMsgQ = UpStreamQ;
-}
-
-pthread_cond_t *get_global_nano_con(void)
-{
-    return &nano_con;
-}
-
-pthread_mutex_t *get_global_nano_mut(void)
-{
-    return &nano_mut;
-}
-
 /*----------------------------------------------------------------------------*/
 /*                             Internal Functions                             */
 /*----------------------------------------------------------------------------*/
@@ -129,12 +93,6 @@ void *handle_upstream()
    sock = nn_socket( AF_SP, NN_PULL );
    if(sock >= 0)
    {
-        int t = NANO_SOCKET_RCV_TIMEOUT_MS;
-        int rc = nn_setsockopt(sock, NN_SOL_SOCKET, NN_RCVTIMEO, &t, sizeof(t));
-        if (rc < 0)
-        {
-            ParodusError ("Unable to set socket receive timeout (errno=%d, %s)\n",errno, strerror(errno));
-        }
        ParodusPrint("Nanomsg bind with get_parodus_cfg()->local_url  %s\n", get_parodus_cfg()->local_url);
        bind = nn_bind(sock, get_parodus_cfg()->local_url);
        if(bind < 0)
@@ -143,19 +101,12 @@ void *handle_upstream()
        }
        else
        {
-            ParodusInfo("nanomsg server gone into the listening mode...\n");
            while( FOREVER() ) 
            {
                buf = NULL;
+                ParodusInfo("nanomsg server gone into the listening mode...\n");
                bytes = nn_recv (sock, &buf, NN_MSG, 0);
-                if (g_shutdown)
-                  break;
-                if (bytes < 0) {
-                  if ((errno != EAGAIN) && (errno != ETIMEDOUT))
-                    ParodusInfo ("Error (%d) receiving message from nanomsg client\n", errno);
-                  continue;
-                }
-                ParodusInfo ("Upstream message received from nanomsg client\n");
+                ParodusInfo ("Upstream message received from nanomsg client: \"%s\"\n", (char*)buf);
                message = (UpStreamMsg *)malloc(sizeof(UpStreamMsg));

                if(message)
@@ -205,15 +156,12 @@ void *processUpstreamMessage()
 {		
    int rv=-1, rc = -1;	
    int msgType;
-    wrp_msg_t *msg,*retrieve_msg = NULL;
-    void *bytes;
+    wrp_msg_t *msg;	
+    void *appendData, *bytes;
+    size_t encodedSize;
    reg_list_item_t *temp = NULL;
    int matchFlag = 0;
    int status = -1;
-	char *device_id = NULL;
-	size_t device_id_len = 0;
-	size_t parodus_len;
-	int ret = -1;

    while(FOREVER())
    {
@@ -238,17 +186,17 @@ void *processUpstreamMessage()
                {
                    ParodusInfo("\n Nanomsg client Registration for Upstream\n");
                    //Extract serviceName and url & store it in a linked list for reg_clients
-                    temp = get_global_node();
                    if(get_numOfClients() !=0)
                    {
                        matchFlag = 0;
                        ParodusPrint("matchFlag reset to %d\n", matchFlag);
+                        temp = get_global_node();
                        while(temp!=NULL)
                        {
                            if(strcmp(temp->service_name, msg->u.reg.service_name)==0)
                            {
                                ParodusInfo("match found, client is already registered\n");
-                                parStrncpy(temp->url,msg->u.reg.url, sizeof(temp->url));
+                                strncpy(temp->url,msg->u.reg.url, strlen(msg->u.reg.url)+1);
                                if(nn_shutdown(temp->sock, 0) < 0)
                                {
                                    ParodusError ("Failed to shutdown\n");
@@ -257,11 +205,11 @@ void *processUpstreamMessage()
                                temp->sock = nn_socket(AF_SP,NN_PUSH );
                                if(temp->sock >= 0)
                                {					
-                                    int t = NANO_SOCKET_SEND_TIMEOUT_MS;
+                                    int t = NANOMSG_SOCKET_TIMEOUT_MSEC;
                                    rc = nn_setsockopt(temp->sock, NN_SOL_SOCKET, NN_SNDTIMEO, &t, sizeof(t));
                                    if(rc < 0)
                                    {
-                                        ParodusError ("Unable to set socket send timeout (errno=%d, %s)\n",errno, strerror(errno));
+                                        ParodusError ("Unable to set socket timeout (errno=%d, %s)\n",errno, strerror(errno));
                                    }
                                    rc = nn_connect(temp->sock, msg->u.reg.url); 
                                    if(rc < 0)
@@ -301,13 +249,11 @@ void *processUpstreamMessage()
                            ParodusPrint("sent auth status to reg client\n");
                        }
                    }
-                    release_global_node ();
                }
                else if(msgType == WRP_MSG_TYPE__EVENT)
                {
-                    ParodusInfo(" Received upstream event data: dest '%s'\n", msg->u.event.dest);
+                    ParodusInfo(" Received upstream event data\n");
                    partners_t *partnersList = NULL;
-                    int j = 0;

                    int ret = validate_partner_id(msg, &partnersList);
                    if(ret == 1)
@@ -329,116 +275,52 @@ void *processUpstreamMessage()
                            sendUpstreamMsgToServer(&bytes, size);
                        }
                        free(eventMsg);
-                        free(bytes);
-                        bytes = NULL;
                    }
                    else
                    {
                        sendUpstreamMsgToServer(&message->msg, message->len);
                    }
-                    if(partnersList != NULL)
-                    {
-                        for(j=0; j<(int)partnersList->count; j++)
-                        {
-                            if(NULL != partnersList->partner_ids[j])
-                            {
-                                free(partnersList->partner_ids[j]);
-                            }
-                        }
-                        free(partnersList);
-                    }
-                    partnersList = NULL;
                }
                else
                {
-					//Sending to server for msgTypes 3, 5, 6, 7, 8.
-					if( WRP_MSG_TYPE__REQ == msgType )
-					{
-						ParodusInfo(" Received upstream data with MsgType: %d dest: '%s' transaction_uuid: %s\n", msgType, msg->u.req.dest, msg->u.req.transaction_uuid );
-						sendUpstreamMsgToServer(&message->msg, message->len);
-					}
-					else
-					{
-						ParodusInfo(" Received upstream data with MsgType: %d dest: '%s' transaction_uuid: %s status: %d\n",msgType, msg->u.crud.dest, msg->u.crud.transaction_uuid, msg->u.crud.status );
-						if(WRP_MSG_TYPE__RETREIVE == msgType)
-						{
-								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. */
-										parodus_len = strlen( PARODUS_SERVICE_NAME );
-										if( 0 == strncmp(PARODUS_SERVICE_NAME, &msg->u.crud.dest[device_id_len], parodus_len-1) ) 
-										{
-											/* For Parodus CRUD queue. */
-											ParodusInfo("Create RetrieveMsg and add to parodus CRUD queue\n");
-											createUpstreamRetrieveMsg(msg, &retrieve_msg);
-											addCRUDmsgToQueue(retrieve_msg);
-										}
-										else
-										{
-											/* 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
-						{
-							sendUpstreamMsgToServer(&message->msg, message->len);
-						}
-					}
-            	}
-           	}
+                    //Sending to server for msgTypes 3, 5, 6, 7, 8.
+                    ParodusInfo(" Received upstream data with MsgType: %d\n", msgType);
+                    //Appending metadata with packed msg received from client
+                    if(metaPackSize > 0)
+                    {
+                        ParodusPrint("Appending received msg with metadata\n");
+                        encodedSize = appendEncodedData( &appendData, message->msg, message->len, metadataPack, metaPackSize );
+                        ParodusPrint("encodedSize after appending :%zu\n", encodedSize);
+                        ParodusPrint("metadata appended upstream msg %s\n", (char *)appendData);
+                        ParodusInfo("Sending metadata appended upstream msg to server\n");
+                        sendMessage(get_global_conn(),appendData, encodedSize);
+
+                        free( appendData);
+                        appendData =NULL;
+                    }
+                    else
+                    {		
+                        ParodusError("Failed to send upstream as metadata packing is not successful\n");
+                    }
+                }
+            }
            else
            {
                ParodusError("Error in msgpack decoding for upstream\n");
            }
+            ParodusPrint("Free for upstream decoded msg\n");
+            wrp_free_struct(msg);
+            msg = NULL;

-			//nn_freemsg should not be done for parodus/tags/ CRUD requests as it is not received through nanomsg.
-			if ((msg && (msg->u.crud.source !=NULL) && wrp_does_service_match("parodus", msg->u.crud.source) == 0))
-			{
-				free(message->msg);
-			}
-			else
-			{
-				if(nn_freemsg (message->msg) < 0)
-				{
-					ParodusError ("Failed to free msg\n");
-				}
-			}
-			ParodusPrint("Free for upstream decoded msg\n");
-			if (msg) {
-                wrp_free_struct(msg);
+            if(nn_freemsg (message->msg) < 0)
+            {
+                ParodusError ("Failed to free msg\n");
            }
-			msg = NULL;
-			free(message);
-			message = NULL;
+            free(message);
+            message = NULL;
        }
        else
        {
-            if (g_shutdown) {
-                pthread_mutex_unlock (&nano_mut);
-                break;
-            }
            ParodusPrint("Before pthread cond wait in consumer thread\n");   
            pthread_cond_wait(&nano_con, &nano_mut);
            pthread_mutex_unlock (&nano_mut);
@@ -448,112 +330,11 @@ void *processUpstreamMessage()
    return NULL;
 }

-/**
- * @brief getDeviceId function to create deviceId in the format "mac:112233445xxx"
- *
- * @param[out] device_id in the format "mac:112233445xxx"
- * @param[out] total size of device_id
- */
-int getDeviceId(char **device_id, size_t *device_id_len)
-{
-	char *deviceID = NULL;
-	size_t len;
-
-	if((get_parodus_cfg()->hw_mac !=NULL) && (strlen(get_parodus_cfg()->hw_mac)!=0))
-	{
-		len = strlen(get_parodus_cfg()->hw_mac) + 5;
-
-		deviceID = (char *) malloc(sizeof(char)*64);
-		if(deviceID != NULL)
-		{
-			snprintf(deviceID, len, "mac:%s", get_parodus_cfg()->hw_mac);
-			*device_id = deviceID;
-			*device_id_len = len;
-		}
-		else
-		{
-			ParodusError("device_id allocation failed\n");
-			return -1;
-		}
-	}
-	else
-	{
-		ParodusError("device mac is NULL\n");
-		return -1;
-	}
-	return 0;
-}
-
-
-/**
- * @brief createUpstreamRetrieveMsg function to create new message for processing Retrieve requests
- *
- * @param[in] message The upstream message received from cloud or internal clients
- * @param[out] retrieve_msg New message for processing Retrieve requests
- */
-void createUpstreamRetrieveMsg(wrp_msg_t *message, wrp_msg_t **retrieve_msg)
-{
-	wrp_msg_t *msg;
-	msg = ( wrp_msg_t * ) malloc( sizeof( wrp_msg_t ) );
-	if(msg != NULL)
-    {
-		memset(msg, 0, sizeof(wrp_msg_t));
-
-		msg->msg_type = message->msg_type;
-		if(message->u.crud.transaction_uuid != NULL)
-		{
-			msg->u.crud.transaction_uuid = strdup(message->u.crud.transaction_uuid);
-		}
-		if(message->u.crud.source !=NULL)
-		{
-			msg->u.crud.source = strdup(message->u.crud.source);
-		}
-		if(message->u.crud.dest != NULL)
-		{
-			msg->u.crud.dest = strdup(message->u.crud.dest);
-		}
-		*retrieve_msg = msg;
-	}
-}
-
-/**
- * @brief getServiceNameAndSendResponse function to fetch client service name and to send msg to it.
- *
- * @param[in] msg The decoded message to fetch client service name from its dest field
- * @param[in] msg_bytes The encoded upstream msg to be sent to client
- * @param[in] msg_size Total size of the msg to send to client
- */
-void getServiceNameAndSendResponse(wrp_msg_t *msg, void **msg_bytes, size_t msg_size)
-{
-	char *serviceName = NULL;
-	int sendStatus =-1;
-
-	serviceName = wrp_get_msg_element(WRP_ID_ELEMENT__SERVICE, msg, DEST);
-	if ( serviceName != NULL)
-	{
-		sendStatus=sendMsgtoRegisteredClients(serviceName,(const char **)msg_bytes, msg_size);
-		if(sendStatus ==1)
-		{
-			ParodusInfo("Send upstreamMsg successfully to registered client %s\n", serviceName);
-		}
-		else
-		{
-			ParodusError("Failed to send upstreamMsg to registered client %s\n", serviceName);
-		}
-		free(serviceName);
-		serviceName = NULL;
-	}
-	else
-	{
-		ParodusError("serviceName is NULL,not sending retrieve response to client\n");
-	}
-}
-
 void sendUpstreamMsgToServer(void **resp_bytes, size_t resp_size)
 {
 	void *appendData;
 	size_t encodedSize;
-	bool close_retry = false;
+
 	//appending response with metadata 			
 	if(metaPackSize > 0)
 	{
@@ -562,18 +343,8 @@ void sendUpstreamMsgToServer(void **resp_bytes, size_t resp_size)
 	   	ParodusPrint("encodedSize after appending :%zu\n", encodedSize);
 	   		   
 		ParodusInfo("Sending response to server\n");
-		close_retry = get_close_retry();
-
-		/* send response when connection retry is not in progress. Also during cloud_disconnect UPDATE request. Here, close_retry becomes 1 hence check is added to send disconnect response to server. */
-		//TODO: Upstream and downstream messages in queue should be handled and queue should be empty before parodus forcefully disconnect from cloud.
-		if(!close_retry || (get_parodus_cfg()->cloud_disconnect !=NULL))
-		{
-			sendMessage(get_global_conn(),appendData, encodedSize);
-		}
-		else
-		{
-			ParodusInfo("close_retry is %d, unable to send response as connection retry is in progress\n", close_retry);
-		}
+	   	sendMessage(get_global_conn(),appendData, encodedSize);
+	   	
 		free(appendData);
 		appendData =NULL;
 	}
--- a/src/upstream.h
+++ b/src/upstream.h
@@ -1,35 +1,18 @@
-/**
- * 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 upstream.h
 *
 * @description This header defines functions required to manage upstream messages.
 *
+ * Copyright (c) 2015  Comcast
 */
 
 #ifndef _UPSTREAM_H_
 #define _UPSTREAM_H_

-#include <pthread.h>
-#include <wrp-c.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
-	
+
 /*----------------------------------------------------------------------------*/
 /*                               Data Structures                              */
 /*----------------------------------------------------------------------------*/
@@ -47,14 +30,8 @@ typedef struct UpStreamMsg__
 void packMetaData();
 void *handle_upstream();
 void *processUpstreamMessage();
-int getDeviceId(char **device_id, size_t *device_id_len);
+
 void sendUpstreamMsgToServer(void **resp_bytes, size_t resp_size);
-void getServiceNameAndSendResponse(wrp_msg_t *msg, void **msg_bytes, size_t msg_size);
-void createUpstreamRetrieveMsg(wrp_msg_t *message, wrp_msg_t **retrieve_msg);
-void set_global_UpStreamMsgQ(UpStreamMsg * UpStreamQ);
-UpStreamMsg * get_global_UpStreamMsgQ(void);
-pthread_cond_t *get_global_nano_con(void);
-pthread_mutex_t *get_global_nano_mut(void);

 #ifdef __cplusplus
 }
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-#   Copyright 2016 Comcast Cable Communications Management, LLCD
+#   Copyright 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.
@@ -16,337 +16,205 @@ 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/token.c)
-set (PARODUS_COMMON_LIBS gcov -lcunit -lcimplog -lwrp-c
- -luuid -lmsgpackc -lnopoll -lnanomsg -lpthread
- -Wl,--no-as-needed -lcjson -lcjwt -ltrower-base64
- -lssl -lcrypto -lrt -lm)
-
-if (ENABLE_SESHAT)
-set (PARODUS_COMMON_LIBS -llibseshat ${PARODUS_COMMON_LIBS})
-endif (ENABLE_SESHAT)
-
-if (FEATURE_DNS_QUERY)
-set (PARODUS_COMMON_LIBS ${PARODUS_COMMON_LIBS} -lucresolv -lresolv)
-endif (FEATURE_DNS_QUERY)
-
-if(NOT DISABLE_VALGRIND)
-set (MEMORY_CHECK valgrind --leak-check=full --show-reachable=yes -v)
-endif ()
+set (PARODUS_COMMON_SRC ../src/string_helpers.c ../src/mutex.c ../src/time.c ../src/config.c ../src/spin_thread.c)
+set (PARODUS_COMMON_LIBS gcov -lcunit -lcimplog -llibseshat -lwrp-c -luuid -lpthread -lm -lmsgpackc -lcjson -ltrower-base64 -lnopoll -lnanomsg -Wl,--no-as-needed -lrt)

 link_directories ( ${LIBRARY_DIR} )

-#-------------------------------------------------------------------------------
-#   test_heartBeatTimer
-#-------------------------------------------------------------------------------
-add_test(NAME test_heartBeatTimer COMMAND ${MEMORY_CHECK} ./test_heartBeatTimer)
-add_executable(test_heartBeatTimer test_heartBeatTimer.c ../src/heartBeat.c)
-target_link_libraries (test_heartBeatTimer ${PARODUS_COMMON_LIBS} -lcmocka)
-
-#-------------------------------------------------------------------------------
-#   test_close_retry
-#-------------------------------------------------------------------------------
-add_test(NAME test_close_retry COMMAND ${MEMORY_CHECK} ./test_close_retry)
-add_executable(test_close_retry test_close_retry.c ../src/close_retry.c)
-target_link_libraries (test_close_retry ${PARODUS_COMMON_LIBS} -lcmocka)
-
 #-------------------------------------------------------------------------------
 #   test_mutex
 #-------------------------------------------------------------------------------
-add_test(NAME test_mutex COMMAND ${MEMORY_CHECK} ./test_mutex)
+add_test(NAME test_mutex COMMAND test_mutex)
 add_executable(test_mutex test_mutex.c ../src/mutex.c)
 target_link_libraries (test_mutex ${PARODUS_COMMON_LIBS} -lcmocka)

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

 #-------------------------------------------------------------------------------
 #   test_nopoll_helpers
 #-------------------------------------------------------------------------------
-add_test(NAME test_nopoll_helpers COMMAND ${MEMORY_CHECK} ./test_nopoll_helpers)
+add_test(NAME test_nopoll_helpers COMMAND test_nopoll_helpers)
 add_executable(test_nopoll_helpers test_nopoll_helpers.c ../src/nopoll_helpers.c)
 target_link_libraries (test_nopoll_helpers -Wl,--no-as-needed -lrt -lcmocka -lcimplog -lnopoll)

+#-------------------------------------------------------------------------------
+#   libpd_test
+#-------------------------------------------------------------------------------
+add_executable (libpd_test libpd_test.c)
+
+target_link_libraries (libpd_test
+                       cunit
+                       -llibparodus
+                       -lwrp-c
+		       -llibseshat
+		       -luuid
+                       -lmsgpackc
+                       -ltrower-base64
+                       -lnanomsg
+                       -lcimplog 
+                       -lm
+                       -lpthread
+                       -lrt)
+
 #-------------------------------------------------------------------------------
 #   test_time
 #-------------------------------------------------------------------------------
-add_test(NAME test_time COMMAND ${MEMORY_CHECK} ./test_time)
+add_test(NAME test_time COMMAND test_time)
 add_executable(test_time test_time.c ../src/time.c)
 target_link_libraries (test_time ${PARODUS_COMMON_LIBS} )

 #-------------------------------------------------------------------------------
 #   test_spin_thread error
 #-------------------------------------------------------------------------------
-add_test(NAME test_spin_thread_e COMMAND ${MEMORY_CHECK} ./test_spin_thread_e)
+add_test(NAME test_spin_thread_e COMMAND test_spin_thread_e)
 add_executable(test_spin_thread_e test_spin_thread_e.c ../src/spin_thread.c)
 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_test(NAME test_spin_thread_s COMMAND 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_test(NAME test_string_helpers COMMAND test_string_helpers)
 add_executable(test_string_helpers test_string_helpers.c ../src/string_helpers.c)
 target_link_libraries (test_string_helpers ${PARODUS_COMMON_LIBS} )

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

-
-#-------------------------------------------------------------------------------
-#   test_nopoll_handlers_fragment
-#-------------------------------------------------------------------------------
-add_test(NAME test_nopoll_handlers_fragment COMMAND ${MEMORY_CHECK} ./test_nopoll_handlers_fragment)
-add_executable(test_nopoll_handlers_fragment test_nopoll_handlers_fragment.c ../src/nopoll_handlers.c ../src/heartBeat.c ../src/close_retry.c)
-target_link_libraries (test_nopoll_handlers_fragment -lnopoll -lcunit -lcimplog -Wl,--no-as-needed -lrt -lpthread -lm -lcmocka)
-
 #-------------------------------------------------------------------------------
 #   test_connection
 #-------------------------------------------------------------------------------
-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/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})
+add_test(NAME test_connection COMMAND test_connection)
+add_executable(test_connection test_connection.c ../src/connection.c ${PARODUS_COMMON_SRC}) 
 target_link_libraries (test_connection ${PARODUS_COMMON_LIBS} -lcmocka)

 #-------------------------------------------------------------------------------
 #   test_connection - function createNopollConnection
 #-------------------------------------------------------------------------------
-#add_test(NAME test_createConnection COMMAND ${MEMORY_CHECK} ./test_createConnection)
-#add_executable(test_createConnection test_createConnection.c ../src/connection.c ../src/string_helpers.c ../src/config.c) 
-#target_link_libraries (test_createConnection ${PARODUS_COMMON_LIBS} -lcmocka)
-#add_executable(test_createConnection test_createConnection.c ../src/connection.c ../src/string_helpers.c ../src/config.c ../src/heartBeat.c) 
-#target_link_libraries (test_createConnection ${PARODUS_CONN_LIBS} ${PARODUS_COMMON_LIBS} -lcmocka )
-#target_link_libraries (test_createConnection ${PARODUS_COMMON_LIBS} -lcmocka )
+add_test(NAME test_createConnection COMMAND test_createConnection)
+add_executable(test_createConnection test_createConnection.c ../src/connection.c ../src/string_helpers.c ../src/config.c) 
+target_link_libraries (test_createConnection ${PARODUS_COMMON_LIBS} -lcmocka)

 #-------------------------------------------------------------------------------
 #   test_client_list
 #-------------------------------------------------------------------------------
-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/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 
- ../src/partners_check.c ../src/crud_interface.c ../src/crud_tasks.c ../src/crud_internal.c ${PARODUS_COMMON_SRC})
-
-if (ENABLE_SESHAT)
-set(CLIST_SRC ${CLIST_SRC} ../src/seshat_interface.c)
-else()
-set(CLIST_SRC ${CLIST_SRC} ../src/seshat_interface_stub.c)
-endif (ENABLE_SESHAT)
- 
-add_executable(test_client_list ${CLIST_SRC})
-#target_link_libraries (test_client_list ${PARODUS_CONN_LIBS} ${PARODUS_COMMON_LIBS})
+add_test(NAME test_client_list COMMAND 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})

 #-------------------------------------------------------------------------------
 #   test_service_alive
 #-------------------------------------------------------------------------------
-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/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()
-set(SVA_SRC ${SVA_SRC} ../src/seshat_interface_stub.c)
-endif (ENABLE_SESHAT)
-
-add_executable(test_service_alive ${SVA_SRC})
-#target_link_libraries (test_service_alive ${PARODUS_CONN_LIBS} ${PARODUS_COMMON_LIBS})
+add_test(NAME test_service_alive COMMAND 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})

 #-------------------------------------------------------------------------------
 #   test_config
 #-------------------------------------------------------------------------------
-add_test(NAME test_config COMMAND ${MEMORY_CHECK} ./test_config)
+add_test(NAME test_config COMMAND test_config)
 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
-)
-
-#-------------------------------------------------------------------------------
-#   test_crud_interface
-#-------------------------------------------------------------------------------
-add_test(NAME test_crud_interface COMMAND ${MEMORY_CHECK} ./test_crud_interface)
-add_executable(test_crud_interface test_crud_interface.c ../src/crud_interface.c ../src/ParodusInternal.c)
-target_link_libraries (test_crud_interface -lcmocka ${PARODUS_COMMON_LIBS} )
-
-#-------------------------------------------------------------------------------
-#   test_crud_tasks
-#-------------------------------------------------------------------------------
-add_test(NAME test_crud_tasks COMMAND ${MEMORY_CHECK} ./test_crud_tasks)
-add_executable(test_crud_tasks test_crud_tasks.c ../src/crud_tasks.c )
-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/string_helpers.c ../src/crud_internal.c )
-target_link_libraries (test_crud_internal -lcmocka ${PARODUS_COMMON_LIBS} )
+target_link_libraries (test_config -lcmocka -lm -Wl,--no-as-needed -lrt -lcimplog)

 #-------------------------------------------------------------------------------
 #   test_upstream
 #-------------------------------------------------------------------------------
-add_test(NAME test_upstream COMMAND ${MEMORY_CHECK} ./test_upstream)
-add_executable(test_upstream test_upstream.c ../src/upstream.c ../src/close_retry.c ../src/string_helpers.c)
-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)
+add_test(NAME test_upstream COMMAND test_upstream)
+add_executable(test_upstream test_upstream.c ../src/upstream.c)
+target_link_libraries (test_upstream -lcmocka ${PARODUS_COMMON_LIBS} )

 #-------------------------------------------------------------------------------
 #   test_downstream
 #-------------------------------------------------------------------------------
-add_test(NAME test_downstream COMMAND ${MEMORY_CHECK} ./test_downstream)
+add_test(NAME test_downstream COMMAND test_downstream)
 add_executable(test_downstream test_downstream.c ../src/downstream.c ../src/string_helpers.c)
-target_link_libraries (test_downstream -lcmocka gcov -lcunit -lcimplog
- -lwrp-c -luuid -lpthread -lmsgpackc -lnopoll
- -Wl,--no-as-needed -lcjson -lcjwt -ltrower-base64
- -lssl -lcrypto -lrt -lm)
-
-#-------------------------------------------------------------------------------
-#   test_downstream_more
-#-------------------------------------------------------------------------------
-add_test(NAME test_downstream_more COMMAND ${MEMORY_CHECK} ./test_downstream_more)
-add_executable(test_downstream_more test_downstream_more.c ../src/downstream.c ../src/string_helpers.c)
-target_link_libraries (test_downstream_more -lcmocka ${PARODUS_COMMON_LIBS} )
+target_link_libraries (test_downstream -lcmocka ${PARODUS_COMMON_LIBS} )

 #-------------------------------------------------------------------------------
 #   test_thread_tasks
 #-------------------------------------------------------------------------------
-add_test(NAME test_thread_tasks COMMAND ${MEMORY_CHECK} ./test_thread_tasks)
+add_test(NAME test_thread_tasks COMMAND test_thread_tasks)
 add_executable(test_thread_tasks test_thread_tasks.c ../src/thread_tasks.c)
 target_link_libraries (test_thread_tasks -lcmocka ${PARODUS_COMMON_LIBS} )

 #-------------------------------------------------------------------------------
 #   test_conn_interface
 #-------------------------------------------------------------------------------
-add_test(NAME test_conn_interface COMMAND ${MEMORY_CHECK} ./test_conn_interface)
-set(CONIFC_SRC test_conn_interface.c 
-  ../src/crud_interface.c ../src/crud_tasks.c ../src/crud_internal.c 
-  ../src/conn_interface.c 
-  ../src/config.c 
-  ../src/token.c
-  ../src/string_helpers.c 
-  ../src/mutex.c
-  ../src/heartBeat.c
-  ../src/close_retry.c
-)
-if (ENABLE_SESHAT)
-set(CONIFC_SRC ${CONIFC_SRC} ../src/seshat_interface.c)
-else()
-set(CONIFC_SRC ${CONIFC_SRC} ../src/seshat_interface_stub.c)
-endif (ENABLE_SESHAT)
-add_executable(test_conn_interface ${CONIFC_SRC})
+add_test(NAME test_conn_interface COMMAND test_conn_interface)
+add_executable(test_conn_interface test_conn_interface.c ../src/conn_interface.c ../src/config.c ../src/string_helpers.c ../src/mutex.c)
 target_link_libraries (test_conn_interface -lcmocka ${PARODUS_COMMON_LIBS} )

 #-------------------------------------------------------------------------------
 #   test_ParodusInternal
 #-------------------------------------------------------------------------------
-add_test(NAME test_ParodusInternal COMMAND ${MEMORY_CHECK} ./test_ParodusInternal)
+add_test(NAME test_ParodusInternal COMMAND 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} )

 #-------------------------------------------------------------------------------
 #   test_partners_check
 #-------------------------------------------------------------------------------
-add_test(NAME test_partners_check COMMAND ${MEMORY_CHECK} ./test_partners_check)
-add_executable(test_partners_check test_partners_check.c ../src/partners_check.c ../src/string_helpers.c)
-target_link_libraries (test_partners_check -lcmocka ${PARODUS_COMMON_LIBS} -lwrp-c)
-
-#-------------------------------------------------------------------------------
-#   test_token - token.c tests
-#-------------------------------------------------------------------------------
-add_test(NAME test_token COMMAND ${MEMORY_CHECK} ./test_token)
-set(TOKEN_SRC ../src/conn_interface.c ../src/config.c
- ../src/connection.c ../src/spin_thread.c
- ../src/service_alive.c ../src/client_list.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/thread_tasks.c ../src/time.c
- ../src/string_helpers.c ../src/mutex.c 
- ../src/token.c ../src/heartBeat.c
- ../src/close_retry.c
- )
-
-if (ENABLE_SESHAT)
-set(TOKEN_SRC ${TOKEN_SRC} ../src/seshat_interface.c)
-else()
-set(TOKEN_SRC ${TOKEN_SRC} ../src/seshat_interface_stub.c)
-endif (ENABLE_SESHAT)
-
-if (FEATURE_DNS_QUERY)
-set(TOKEN_SRC test_token.c ${TOKEN_SRC})
-else()
-set(TOKEN_SRC test_token_stub.c ${TOKEN_SRC})
-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 )
-
-#-------------------------------------------------------------------------------
-#   test_seshat_interface - registerWithSeshat
-#-------------------------------------------------------------------------------
-add_test(NAME test_seshat_interface COMMAND ${MEMORY_CHECK} ./test_seshat_interface)
-if (ENABLE_SESHAT)
-set(SESHIFC_SRC test_seshat_interface.c ../src/seshat_interface.c ../src/string_helpers.c)
-else()
-set(SESHIFC_SRC test_seshat_interface_stub.c ../src/seshat_interface_stub.c)
-endif (ENABLE_SESHAT)
-add_executable(test_seshat_interface ${SESHIFC_SRC})
-target_link_libraries (test_seshat_interface -lcmocka ${PARODUS_COMMON_LIBS} -lwrp-c)
+add_test(NAME test_partners_check COMMAND test_partners_check)
+add_executable(test_partners_check test_partners_check.c ../src/partners_check.c)
+target_link_libraries (test_partners_check -lcmocka -lwrp-c -llibseshat ${PARODUS_COMMON_LIBS})

 if (INTEGRATION_TESTING)
 #-------------------------------------------------------------------------------
 #   simple_connection test
 #-------------------------------------------------------------------------------
-add_test(NAME simple_connection COMMAND ${MEMORY_CHECK} ./simple_connection)
-set(SIMCON_SRC simple_connection.c ${PARODUS_COMMON_SRC} ../src/upstream.c ../src/conn_interface.c
- ../src/thread_tasks.c ../src/downstream.c ../src/networking.c ../src/nopoll_helpers.c ../src/nopoll_handlers.c ../src/connection.c ../src/ParodusInternal.c ../src/client_list.c ../src/partners_check.c ../src/service_alive.c)
-if (ENABLE_SESHAT)
-set(SIMCON_SRC ${SIMCON_SRC} ../src/seshat_interface.c)
-else()
-set(SIMCON_SRC ${SIMCON_SRC} ../src/seshat_interface_stub.c)
-endif (ENABLE_SESHAT)
-add_executable(simple_connection ${SIMCON_SRC}) 
-target_link_libraries (simple_connection ${PARODUS_CONN_LIBS} ${PARODUS_COMMON_LIBS} )
+add_test(NAME simple_connection COMMAND simple_connection)
+add_executable(simple_connection simple_connection.c ${PARODUS_COMMON_SRC}
+                    ../src/upstream.c
+                    ../src/conn_interface.c
+                    ../src/thread_tasks.c
+                    ../src/downstream.c
+                    ../src/networking.c
+                    ../src/nopoll_helpers.c
+                    ../src/nopoll_handlers.c
+                    ../src/connection.c
+                    ../src/ParodusInternal.c
+                    ../src/client_list.c
+                    ../src/partners_check.c
+                    ../src/service_alive.c) 
+target_link_libraries (simple_connection ${PARODUS_COMMON_LIBS})

 #-------------------------------------------------------------------------------
 #   simple test
 #-------------------------------------------------------------------------------
-add_test(NAME simple COMMAND ${MEMORY_CHECK} ./simple)
-set(SIMPLE_SRC simple.c ../src/upstream.c ../src/conn_interface.c ../src/downstream.c ../src/thread_tasks.c ../src/networking.c ../src/nopoll_helpers.c ../src/nopoll_handlers.c ../src/string_helpers.c ../src/mutex.c ../src/time.c
- ../src/config.c ../src/connection.c ../src/ParodusInternal.c ../src/spin_thread.c ../src/client_list.c ../src/partners_check.c ../src/service_alive.c)
-if (ENABLE_SESHAT)
-set(SIMPLE_SRC ${SIMPLE_SRC} ../src/seshat_interface.c)
-else()
-set(SIMPLE_SRC ${SIMPLE_SRC} ../src/seshat_interface_stub.c)
-endif (ENABLE_SESHAT)
-add_executable(simple ${SIMPLE_SRC}) 
+add_test(NAME simple COMMAND simple)
+add_executable(simple simple.c
+                    ../src/upstream.c
+                    ../src/conn_interface.c
+                    ../src/downstream.c
+                    ../src/thread_tasks.c
+                    ../src/networking.c
+                    ../src/nopoll_helpers.c
+                    ../src/nopoll_handlers.c
+                    ../src/string_helpers.c
+                    ../src/mutex.c
+                    ../src/time.c
+                    ../src/config.c
+                    ../src/connection.c
+                    ../src/ParodusInternal.c
+                    ../src/spin_thread.c
+                    ../src/client_list.c
+                    ../src/partners_check.c
+                    ../src/service_alive.c) 

-target_link_libraries (simple ${PARODUS_CONN_LIBS} ${PARODUS_COMMON_LIBS}  gcov -lnopoll )
+target_link_libraries (simple ${PARODUS_COMMON_LIBS} gcov -lnopoll -lnanomsg )
 endif (INTEGRATION_TESTING)
--- a/tests/key4.pem
+++ b/tests/key4.pem
@@ -1,28 +0,0 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDsLxH6GZFxU64v
-GL9CNz3hLSoCb7TckabgbVp6PIRy9cKEwfqnQ/2ohqrdolMA6Peru2+DgBs1iJ3u
-JNSc+8XFphUj0Jm2gVumVfclSZTEkM4xI4D3ABXn0Pj6/Ps5Skx9pXk3KI988ksB
-secD+FNqBPgmKWG0Gp+JSrPEwAtA4ZBP/4vtCGxEFzRCSOSBkTh27n1f08M4PjsY
-+vMvyTVF67y4Zb3nWJHpa1yOBlHid0xI138KPEBl+9Vai1AwRWbhlq52I9+IVjCo
-N7Ui9KbRgfd21SJFLh3hDw6xSrNqtcU+mvv5GuLAxHF5tCcGpAgKvKhvjQU4v+fh
-lGW77zkVAgMBAAECggEBAI8DoZsTyGIbDaovDgEGek3Tj1CSW64D9EyJavQBmSIT
-don0+9Y08XAOu4AhPqmaZ/5xLQEvnUo5Q4hkfOnh+svH2Z0qPymoAtshytmlSJQO
-KwzONtVaE+mfPGSes3DpcI/UlyWzRc+e15RbKUvaHohgIfLZs/Pe+yOjPF+y+h16
-Tpvklvk9GuS5/njOm0N8iRZw0+mKMLjwKCf0Q9WpF5OXW7hYccG9aTpmiUDnpixP
-nMyEdZMhmfFDLl+t6Txj3KhNX8jixDmfkuiPuoADWZuYk3GjS499nb3Y5Tmm8TLq
-jf0St48y1bObNnkceSqODnUK2hUZzzWcgTLwIC1E0DECgYEA+QoVuCA5i3eAiyE7
-PUsKpT0qVH/rWVWl0HYykUI7MSv0KJH7uPS+m2GzScxpCZoA4wtu6iK5IePNf645
-yJAleglx+1vuBGCWQrr206gOPWrkthfVHd+pDCr/fnIG+RdNr9SgwUx1youpovQ4
-x64RQuEyBXENt+xx2+fFI28GxEcCgYEA8skAisNqPgREewZ+hM2OkhIyU7GaKWgt
-HfjPYHHYWVO/sSfOdcyzcCUZJkseBhIVEmIeiXM4NCO0spmieHa6bo8oLr1nPMtm
-J4UkyVRPtO99V5mIBYOS3cWAEwEt7lWZ+4JiIyEBO/tMVjIrB8YkOE4LqV40Vvpu
-XGJbtw3JEcMCgYEA15xnmXYs3Bamb85hn3tsyArgry/g7wM7//OVbDXPUY8gYE+j
-hEpBC/3WX7pd5jYzNl8btBJD/pdfv39z/7Ts/W9YA6tfsuJ8tWFxeWYyjfIR+aVA
-mhCeJy7C7RKD/vyyAd0xIKm2AZpRUAfpcNe/kguuZw+uNOK84QsUnsztKtkCgYAE
-KBDMT2AoQ6ZwfMH5wBMqyQj3idjb0J7FHpdeTVSo4tgrTkUomyKPTvNJRovzCqg1
-slxXehOCQQI89Ihli5LRhb3oXvG/hrPvBUaF892ReXAp6cT8Yy5GgbUZnjGNHQYP
-2kGX3F7LChhaeW1nKqtAE4X7llNLEeqFxmFPlvrURQKBgA0c5s3WPeX5OfSRsLaF
-iXaQNQ88QORNJ4hp/L7/o3ZNy7elH/R3GM1fs8Yf711CDxy4qI7icRYyrkl0P/Py
-WyRbNnvw0JMa5xkzRgKlnvspfEfve7gzcZhE9yEw173MIyyoxIn43G9aGNSN3QIR
-51ZlCYyuIAgR7p+9lKvM74HR
-----END PRIVATE KEY-----
--- a/tests/libpd_test.c
+++ b/tests/libpd_test.c
@@ -0,0 +1,402 @@
+/**
+ *  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 <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <CUnit/Basic.h>
+#include <stdbool.h>
+
+#include <libparodus.h>
+#include <pthread.h>
+
+#define SEND_EVENT_MSGS 1
+
+//#define TCP_URL(ip) "tcp://" ip
+
+#define GOOD_CLIENT_URL "tcp://127.0.0.1:6667"
+//#define PARODUS_URL "ipc:///tmp/parodus_server.ipc"
+#define GOOD_PARODUS_URL "tcp://127.0.0.1:6666"
+//#define CLIENT_URL "ipc:///tmp/parodus_client.ipc"
+
+
+static void initEndKeypressHandler();
+static void *endKeypressHandlerTask();
+
+static pthread_t endKeypressThreadId;
+
+static const char *service_name = "iot";
+//static const char *service_name = "config";
+
+static bool no_mock_send_only_test = false;
+
+static libpd_instance_t test_instance;
+
+// libparodus functions to be tested
+extern int flush_wrp_queue (uint32_t delay_ms);
+extern int connect_receiver (const char *rcv_url);
+extern int connect_sender (const char *send_url);
+extern void shutdown_socket (int *sock);
+
+extern bool is_auth_received (void);
+extern int libparodus_receive__ (wrp_msg_t **msg, uint32_t ms);
+
+// libparodus_log functions to be tested
+extern int get_valid_file_num (const char *file_name, const char *date);
+extern int get_last_file_num_in_dir (const char *date, const char *log_dir);
+
+extern const char *wrp_queue_name;
+extern const char *parodus_url;
+extern const char *client_url;
+extern volatile int keep_alive_count;
+extern volatile int reconnect_count;
+
+void show_src_dest_payload (char *src, char *dest, void *payload, size_t payload_size)
+{
+	size_t i;
+	char *payload_str = (char *) payload;
+	printf (" SOURCE:  %s\n", src);
+	printf (" DEST  :  %s\n", dest);
+	printf (" PAYLOAD: ");
+	for (i=0; i<payload_size; i++)
+		putchar (payload_str[i]);
+	putchar ('\n');
+}
+
+void show_wrp_req_msg (struct wrp_req_msg *msg)
+{
+	show_src_dest_payload (msg->source, msg->dest, msg->payload, msg->payload_size);
+}
+
+void show_wrp_event_msg (struct wrp_event_msg *msg)
+{
+	show_src_dest_payload (msg->source, msg->dest, msg->payload, msg->payload_size);
+}
+
+void show_wrp_msg (wrp_msg_t *wrp_msg)
+{
+	printf ("Received WRP Msg type %d\n", wrp_msg->msg_type);
+	if (wrp_msg->msg_type == WRP_MSG_TYPE__REQ) {
+		show_wrp_req_msg (&wrp_msg->u.req);
+		return;
+	}
+	if (wrp_msg->msg_type == WRP_MSG_TYPE__EVENT) {
+		show_wrp_event_msg (&wrp_msg->u.event);
+		return;
+	}
+	return;
+}
+
+void send_reply (wrp_msg_t *wrp_msg)
+{
+	size_t i;
+	size_t payload_size = wrp_msg->u.req.payload_size;
+	char *payload = (char *) wrp_msg->u.req.payload;
+	char *temp;
+	// swap source and dest
+	temp = wrp_msg->u.req.source;
+	wrp_msg->u.req.source = wrp_msg->u.req.dest;
+	wrp_msg->u.req.dest = temp;
+	// Alter the payload
+	for (i=0; i<payload_size; i++)
+		payload[i] = tolower (payload[i]);
+	libparodus_send (test_instance, wrp_msg);
+}
+
+char *new_str (const char *str)
+{
+	char *buf = malloc (strlen(str) + 1);
+	if (NULL == buf)
+		return NULL;
+	strcpy (buf, str);
+	return buf;
+}
+
+void insert_number_into_buf (char *buf, unsigned num)
+{
+	char *pos = strrchr (buf, '#');
+	if (NULL == pos)
+		return;
+	while (true) {
+		*pos = (num%10) + '0';
+		num /= 10;
+		if (pos <= buf)
+			break;
+		pos--;
+		if (*pos != '#')
+			break;
+	}
+}
+
+int send_event_msg (const char *src, const char *dest, 
+	const char *payload, unsigned event_num)
+{
+	int rtn = 0;
+	char *payload_buf;
+	wrp_msg_t *new_msg;
+
+#ifndef SEND_EVENT_MSGS
+	return 0;
+#endif
+	new_msg = malloc (sizeof (wrp_msg_t));
+	if (NULL == new_msg)
+		return -1;
+	printf ("Making event msg\n");
+	new_msg->msg_type = WRP_MSG_TYPE__EVENT;
+	new_msg->u.event.source = new_str (src);
+	new_msg->u.event.dest = new_str (dest);
+	new_msg->u.event.headers = NULL;
+	new_msg->u.event.metadata = NULL;
+	payload_buf = new_str (payload);
+	insert_number_into_buf (payload_buf, event_num);
+	new_msg->u.event.payload = (void*) payload_buf;
+	new_msg->u.event.payload_size = strlen (payload) + 1;
+	printf ("Sending event msg %u\n", event_num);
+	rtn = libparodus_send (test_instance, new_msg);
+	//printf ("Freeing event msg\n");
+	wrp_free_struct (new_msg);
+	//printf ("Freed event msg\n");
+	return rtn;
+}
+
+int send_event_msgs (unsigned *msg_num, unsigned *event_num, int count)
+{
+	int i;
+	unsigned msg_num_mod;
+
+#ifndef SEND_EVENT_MSGS
+	return 0;
+#endif
+	if (NULL != msg_num) {
+		(*msg_num)++;
+		msg_num_mod = (*msg_num) % 3;
+		if (msg_num_mod != 0)
+			return 0;
+	}
+	for (i=0; i<count; i++) {
+		(*event_num)++;
+		if (send_event_msg ("---LIBPARODUS---", "---ParodusService---",
+			"---EventMessagePayload####", *event_num) != 0)
+			return -1;
+	}
+	return 0;
+}
+
+int get_msg_num (const char *msg)
+{
+	int num = -1;
+	bool found_pound = false;
+	int i;
+	char c;
+
+	for (i=0; (c=msg[i]) != 0; i++)
+	{
+		if (!found_pound) {
+			if (c == '#')
+				found_pound = true;
+			continue;
+		}
+		if ((c>='0') && (c<='9')) {
+			if (num == -1)
+				num = c - '0';
+			else
+				num = 10*num + (c - '0');
+		}
+	}
+	return num;
+}
+
+static int flush_queue_count = 0;
+
+void qfree (void * msg)
+{
+	flush_queue_count++;
+	free (msg);
+}
+
+void delay_ms(unsigned int secs, unsigned int msecs)
+{
+  struct timespec ts;
+  ts.tv_sec = (time_t) secs;
+  ts.tv_nsec = (long) msecs * 1000000L;
+  nanosleep (&ts, NULL);
+}
+
+void dbg_log_err (const char *fmt, ...)
+{
+		char errbuf[100];
+
+    va_list arg_ptr;
+    va_start(arg_ptr, fmt);
+    vprintf(fmt, arg_ptr);
+    va_end(arg_ptr);
+		printf ("LIBPD_TEST: %s\n", strerror_r (errno, errbuf, 100));
+}
+
+void wait_auth_received (void)
+{
+	if (!is_auth_received ()) {
+		printf ("Waiting for auth received\n");
+		sleep(1);
+	}
+	if (!is_auth_received ()) {
+		printf ("Waiting for auth received\n");
+		sleep(1);
+	}
+	CU_ASSERT (is_auth_received ());
+}
+
+void test_send_only (void)
+{
+	unsigned event_num = 0;
+
+        libpd_cfg_t cfg = {.service_name = service_name,
+                .receive = false, .keepalive_timeout_secs = 0};
+        CU_ASSERT (libparodus_init (&test_instance, &cfg) == 0);
+        CU_ASSERT (send_event_msgs (NULL, &event_num, 10) == 0);
+	CU_ASSERT (libparodus_shutdown (&test_instance) == 0);
+}
+
+ void test_1(void)
+{
+	unsigned msgs_received_count = 0;
+	int rtn;
+	wrp_msg_t *wrp_msg;
+	unsigned event_num = 0;
+	unsigned msg_num = 0;
+        libpd_cfg_t cfg = {.service_name = service_name,
+                .receive = true, .keepalive_timeout_secs = 0};
+
+	if (no_mock_send_only_test) {
+		test_send_only ();
+		return;
+	}
+
+        cfg.parodus_url = GOOD_PARODUS_URL;
+        cfg.client_url = GOOD_CLIENT_URL;
+        CU_ASSERT (libparodus_init (&test_instance, &cfg) == 0);
+	printf ("LIBPD_TEST: libparodus_init successful\n");
+	initEndKeypressHandler ();
+
+	wait_auth_received ();
+
+	printf ("LIBPD_TEST: starting msg receive loop\n");
+	while (true) {
+		rtn = libparodus_receive (test_instance, &wrp_msg, 2000);
+		if (rtn == 1) {
+			printf ("LIBPD_TEST: Timed out waiting for msg\n");
+			if (msgs_received_count > 0)
+				if (send_event_msgs (&msg_num, &event_num, 5) != 0)
+					break;
+			continue;
+		}
+		if (rtn != 0)
+			break;
+		show_wrp_msg (wrp_msg);
+		msgs_received_count++;
+		if (wrp_msg->msg_type == WRP_MSG_TYPE__REQ)
+			send_reply (wrp_msg);
+		wrp_free_struct (wrp_msg);
+		if (send_event_msgs (&msg_num, &event_num, 5) != 0)
+			break;
+	}
+	printf ("Messages received %u\n", msgs_received_count);
+	CU_ASSERT (libparodus_shutdown (&test_instance) == 0);
+}
+
+/*
+ * @brief To initiate end keypress handler
+ */
+static void initEndKeypressHandler()
+{
+	int err = 0;
+	err = pthread_create(&endKeypressThreadId, NULL, endKeypressHandlerTask, NULL);
+	if (err != 0) 
+	{
+		libpd_log (LEVEL_ERROR, "Error creating End Keypress Handler thread\n");
+	}
+	else 
+	{
+		printf ("End Keypress handler Thread created successfully\n");
+		printf ("\n--->> Press <Enter> to shutdown the test. ---\n");
+	}
+}
+
+/*
+ * @brief To handle End Keypress
+ */
+static void *endKeypressHandlerTask()
+{
+	char inbuf[10];
+	memset(inbuf, 0, 10);
+	while (true) {
+		fgets (inbuf, 10, stdin);
+		if ((inbuf[0] != '\n') && (inbuf[0] != '\0')) {
+            printf ("endKeyPressHandler exiting\n");
+			break;
+		}
+	}
+	libparodus_close_receiver (test_instance);
+	return NULL;
+}
+
+
+void add_suites( CU_pSuite *suite )
+{
+    *suite = CU_add_suite( "libparodus tests", NULL, NULL );
+    CU_add_test( *suite, "Test 1", test_1 );
+}
+
+/*----------------------------------------------------------------------------*/
+/*                             External Functions                             */
+/*----------------------------------------------------------------------------*/
+int main( int argc, char **argv __attribute__((unused)) )
+{
+    unsigned rv = 1;
+    CU_pSuite suite = NULL;
+
+		if (argc > 1) {
+			const char *arg = argv[1];
+			if ((arg[0] == 's') || (arg[0] == 'S'))
+				no_mock_send_only_test = true;
+		}
+
+    if( CUE_SUCCESS == CU_initialize_registry() ) {
+        add_suites( &suite );
+
+        if( NULL != suite ) {
+            CU_basic_set_mode( CU_BRM_VERBOSE );
+            CU_basic_run_tests();
+            printf( "\n" );
+            CU_basic_show_failures( CU_get_failure_list() );
+            printf( "\n\n" );
+            rv = CU_get_number_of_tests_failed();
+        }
+
+        CU_cleanup_registry();
+    }
+
+    if( 0 != rv ) {
+        return 1;
+    }
+    return 0;
+}
--- a/tests/parodus_cmd.sh
+++ b/tests/parodus_cmd.sh
@@ -1,3 +0,0 @@
-sudo ./parodus --hw-model=TG1682 --hw-serial-number=Fer23u948590 --hw-manufacturer=ARRISGroup,Inc. --hw-mac=aabb33ddeeff --hw-last-reboot-reason=unknown --fw-name=TG1682_DEV_master_2016000000sdy --boot-time=123589 --webpa-ping-timeout=180 --webpa-backoff-max=0 --webpa-interface-used=p7p1 --webpa-url=https://example.net:8080 --acquire-jwt=1 --jwt-algo=RS256 --jwt-public-key-file=../../tests/webpa-rs256.pem --dns-txt-url=example.net
-
- 
--- a/tests/pubkey4.pem
+++ b/tests/pubkey4.pem
@@ -1,9 +0,0 @@
-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7C8R+hmRcVOuLxi/Qjc9
-4S0qAm+03JGm4G1aejyEcvXChMH6p0P9qIaq3aJTAOj3q7tvg4AbNYid7iTUnPvF
-xaYVI9CZtoFbplX3JUmUxJDOMSOA9wAV59D4+vz7OUpMfaV5NyiPfPJLAbHnA/hT
-agT4JilhtBqfiUqzxMALQOGQT/+L7QhsRBc0QkjkgZE4du59X9PDOD47GPrzL8k1
-Reu8uGW951iR6WtcjgZR4ndMSNd/CjxAZfvVWotQMEVm4ZaudiPfiFYwqDe1IvSm
-0YH3dtUiRS4d4Q8OsUqzarXFPpr7+RriwMRxebQnBqQICryob40FOL/n4ZRlu+85
-FQIDAQAB
-----END PUBLIC KEY-----
--- a/tests/return_failure.bsh
+++ b/tests/return_failure.bsh
@@ -1 +0,0 @@
-echo -n FAILURE
--- a/tests/return_ser_mac.bsh
+++ b/tests/return_ser_mac.bsh
@@ -1 +0,0 @@
-echo -n SER_MAC $1 $2
--- a/tests/return_success.bsh
+++ b/tests/return_success.bsh
@@ -1 +0,0 @@
-echo -n SUCCESS
--- a/tests/simple.c
+++ b/tests/simple.c
@@ -0,0 +1,712 @@
+/**
+ *  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 <stdarg.h>
+
+#include <CUnit/Basic.h>
+#include <stdbool.h>
+
+#include <assert.h>
+#include <nopoll.h>
+
+//#include <nanomsg/bus.h>
+
+#include "../src/ParodusInternal.h"
+#include "../src/config.h"
+#include "../src/nopoll_helpers.h"
+#include "../src/downstream.h"
+#include "../src/upstream.h"
+
+#include<errno.h>
+
+/* Nanomsg related Macros */
+#define ENDPOINT "tcp://127.0.0.1:6666"
+#define CLIENT1_URL "tcp://127.0.0.1:6667"
+#define CLIENT2_URL "tcp://127.0.0.1:6668"
+#define CLIENT3_URL "tcp://127.0.0.1:6669"
+#define HTTP_CUSTOM_HEADER_COUNT                    	4
+
+static void send_nanomsg_upstream(void **buf, int size);
+void *handle_testsuites();
+headers_t headers = { 2, {"Header 1", "Header 2"}};
+
+void test_nanomsg_client_registration1()
+{
+		    
+	/*****Test svc registation for nanomsg client1 ***/
+	ParodusInfo("test_nanomsg_client_registration1\n");
+
+	const wrp_msg_t reg = { .msg_type = WRP_MSG_TYPE__SVC_REGISTRATION,
+	  .u.reg.service_name = "iot",
+	  .u.reg.url = CLIENT1_URL};
+	  
+	void *bytes;
+	int size =0;
+	int rv1, rc;
+	wrp_msg_t  *msg1;
+	int sock, bind;
+	int byte =0;
+	int t=25000;
+	  
+	// msgpack encode
+	ParodusPrint("msgpack encode\n");
+	size = wrp_struct_to( &reg, WRP_BYTES, &bytes );
+
+	/*** Enable this to decode and verify upstream registration msg **/
+	/***	
+	rv = wrp_to_struct(bytes, size, WRP_BYTES, &message);
+	ParodusPrint("decoded msgType:%d\n", message->msg_type);
+	ParodusPrint("decoded service_name:%s\n", message->u.reg.service_name);
+	ParodusPrint("decoded dest:%s\n", message->u.reg.url);
+	wrp_free_struct(message);	
+	***/
+	  
+	//nanomsg socket
+	sock = nn_socket (AF_SP, NN_PUSH);
+	int connect = nn_connect (sock, ENDPOINT);
+	CU_ASSERT(connect >= 0);
+	rc = nn_setsockopt(sock, NN_SOL_SOCKET, NN_SNDTIMEO, &t, sizeof(t));
+	CU_ASSERT(rc >= 0);
+	byte = nn_send (sock, bytes, size, 0);
+	ParodusInfo("----->Expected byte to be sent:%d\n", size);
+	ParodusInfo("----->actual byte sent:%d\n", byte);
+	ParodusInfo("Nanomsg client1 - Testing Upstream Registration msg send\n");		
+	CU_ASSERT_EQUAL( byte, size );
+
+	//************************************************************
+
+	int sock1 = nn_socket (AF_SP, NN_PULL);
+	byte = 0;
+	bind = nn_bind(sock1, reg.u.reg.url);
+	CU_ASSERT(bind >= 0);
+	
+	void *buf = NULL;
+	rc = nn_setsockopt(sock1, NN_SOL_SOCKET, NN_RCVTIMEO, &t, sizeof(t));
+	CU_ASSERT(rc >= 0);
+	
+	ParodusPrint("Client 1 waiting for acknowledgement \n");
+	byte = nn_recv(sock1, &buf, NN_MSG, 0);
+	ParodusInfo("Data Received for client 1 : %s \n", (char * )buf);
+
+	rv1 = wrp_to_struct((void *)buf, byte, WRP_BYTES, &msg1);
+
+	CU_ASSERT_EQUAL( rv1, byte );
+	
+	ParodusPrint("msg1->msg_type for client 1 = %d \n", msg1->msg_type);
+	ParodusPrint("msg1->status for client 1 = %d \n", msg1->u.auth.status);
+	CU_ASSERT_EQUAL(msg1->msg_type, 2);
+	CU_ASSERT_EQUAL(msg1->u.auth.status, 200);
+
+	rc = nn_freemsg(buf);	
+        CU_ASSERT(rc == 0);
+	free(bytes);	
+	wrp_free_struct(msg1);
+	rc = nn_shutdown(sock1, bind);
+        CU_ASSERT(rc == 0);
+}
+
+void test_nanomsg_client_registration2()
+{
+		    
+	/*****Test svc registation for upstream - nanomsg client2 ***/
+	ParodusInfo("test_nanomsg_client_registration2\n");
+	
+	const wrp_msg_t reg = { .msg_type = WRP_MSG_TYPE__SVC_REGISTRATION,
+	  .u.reg.service_name = "iot2",
+	  .u.reg.url = CLIENT2_URL};
+	  
+	void *bytes;
+	int size;
+	int rv1, rc;
+	wrp_msg_t  *msg1;
+	int sock, bind;
+	int byte =0;
+	int t=28000;
+	  
+	// msgpack encode
+	ParodusPrint("msgpack encode\n");
+	size = wrp_struct_to( &reg, WRP_BYTES, &bytes );
+
+	/*** Enable this to decode and verify packed upstream registration msg **/
+	/**
+	rv = wrp_to_struct(bytes, size, WRP_BYTES, &message);
+	ParodusPrint("decoded msgType:%d\n", message->msg_type);
+	ParodusPrint("decoded service_name:%s\n", message->u.reg.service_name);
+	ParodusPrint("decoded dest:%s\n", message->u.reg.url);
+	wrp_free_struct(message);
+	***/
+	  
+	//nanomsg socket 
+	sock = nn_socket (AF_SP, NN_PUSH);
+	int connect = nn_connect (sock, ENDPOINT);
+	CU_ASSERT( connect >= 0);
+	rc = nn_setsockopt(sock, NN_SOL_SOCKET, NN_SNDTIMEO, &t, sizeof(t));
+	CU_ASSERT(rc >= 0);
+	byte = nn_send (sock, bytes, size,0);
+	ParodusInfo("----->Expected byte to be sent:%d\n", size);
+	ParodusInfo("----->actual byte sent:%d\n", byte);
+	ParodusInfo("Nanomsg client2 - Testing Upstream Registration msg send\n");
+	CU_ASSERT_EQUAL( byte, size );
+
+	int sock1 = nn_socket (AF_SP, NN_PULL);
+	byte = 0;
+	bind = nn_bind(sock1, reg.u.reg.url);
+	CU_ASSERT(bind >= 0);
+	
+	void *buf1 = NULL;
+	
+	rc = nn_setsockopt(sock1, NN_SOL_SOCKET, NN_RCVTIMEO, &t, sizeof(t));
+        CU_ASSERT(rc >= 0);
+        
+	ParodusPrint("Client 2 waiting for acknowledgement \n");
+	
+	byte = nn_recv(sock1, &buf1, NN_MSG, 0);
+	ParodusInfo("Data Received : %s \n", (char * )buf1);
+
+	rv1 = wrp_to_struct((void *)buf1, byte, WRP_BYTES, &msg1);
+	CU_ASSERT_EQUAL( rv1, byte );
+	ParodusPrint("msg1->msg_type for client 2 = %d \n", msg1->msg_type);
+	ParodusPrint("msg1->status for client 2 = %d \n", msg1->u.auth.status);
+	CU_ASSERT_EQUAL(msg1->msg_type, 2);
+	CU_ASSERT_EQUAL(msg1->u.auth.status, 200);
+	
+	rc = nn_freemsg(buf1);	
+	CU_ASSERT(rc == 0);
+	free(bytes);
+	wrp_free_struct(msg1);
+        rc = nn_shutdown(sock1, bind);
+        CU_ASSERT(rc == 0);
+
+}
+
+
+void test_nanomsg_client_registration3()
+{
+		    
+	/*****Test svc registation for upstream - nanomsg client2 ***/
+	ParodusInfo("test_nanomsg_client_registration3\n");
+	
+	const wrp_msg_t reg = { .msg_type = WRP_MSG_TYPE__SVC_REGISTRATION,
+	  .u.reg.service_name = "iot",
+	  .u.reg.url = CLIENT3_URL};
+	void *bytes;
+	int size;
+	int rv1, rc;
+	wrp_msg_t *msg1;
+	int sock;
+	int byte =0;
+	int t=35000;
+	  
+	// msgpack encode
+	ParodusPrint("msgpack encode\n");
+	size = wrp_struct_to( &reg, WRP_BYTES, &bytes );
+
+	/*** Enable this to decode and verify packed upstream registration msg **/
+	/**
+	rv = wrp_to_struct(bytes, size, WRP_BYTES, &message);		
+	ParodusPrint("decoded msgType:%d\n", message->msg_type);
+	ParodusPrint("decoded service_name:%s\n", message->u.reg.service_name);
+	ParodusPrint("decoded dest:%s\n", message->u.reg.url);
+	wrp_free_struct(message);
+	***/
+	  
+	//nanomsg socket 
+	sock = nn_socket (AF_SP, NN_PUSH);
+	int connect = nn_connect (sock, ENDPOINT);
+	CU_ASSERT(connect >= 0);
+	rc = nn_setsockopt(sock, NN_SOL_SOCKET, NN_SNDTIMEO, &t, sizeof(t));
+	CU_ASSERT(rc >= 0);
+	byte = nn_send (sock, bytes, size,0);
+	ParodusInfo("----->Expected byte to be sent:%d\n", size);
+	ParodusInfo("----->actual byte sent:%d\n", byte);
+	ParodusInfo("Nanomsg client3 - Testing Upstream Registration msg send\n");
+	CU_ASSERT_EQUAL( byte, size );
+
+	int sock1 = nn_socket (AF_SP, NN_PULL);
+	byte = 0;
+	
+	int bind = nn_bind(sock1, reg.u.reg.url);
+        CU_ASSERT(bind >= 0);
+	ParodusPrint("Need to close this bind %d \n", bind);
+	
+	void *buf2 = NULL;
+	
+	rc = nn_setsockopt(sock1, NN_SOL_SOCKET, NN_RCVTIMEO, &t, sizeof(t));
+	CU_ASSERT(rc >= 0);
+	ParodusPrint("Client 3 is waiting for acknowledgement \n");
+	byte = nn_recv(sock1, &buf2, NN_MSG, 0);
+	
+	ParodusInfo("Data Received : %s \n", (char * )buf2);
+	
+	rv1 = wrp_to_struct((void *)buf2, byte, WRP_BYTES, &msg1);
+	CU_ASSERT_EQUAL( rv1, byte );
+	ParodusPrint("msg1->msg_type for client 3 = %d \n", msg1->msg_type);
+	ParodusPrint("msg1->status for client 3 = %d \n", msg1->u.auth.status);
+	CU_ASSERT_EQUAL(msg1->msg_type, 2);
+	CU_ASSERT_EQUAL(msg1->u.auth.status, 200);
+	
+	rc = nn_freemsg(buf2);
+	CU_ASSERT(rc == 0);
+	free(bytes);
+	wrp_free_struct(msg1);
+        rc = nn_shutdown(sock1, bind);
+        CU_ASSERT(rc == 0);
+	
+}
+
+void test_nanomsg_downstream_success()
+{
+
+	ParodusInfo("test_nanomsg_downstream_success\n");
+	
+	int sock;
+	int bit=0, rc;
+	wrp_msg_t *message;
+	void *buf =NULL;
+	char* destVal = NULL;
+//	char dest[32] = {'\0'};
+	char *dest = NULL;
+	//char *temp_ptr;
+	int bind = -1;
+	
+	const wrp_msg_t msg = { .msg_type = WRP_MSG_TYPE__SVC_REGISTRATION,
+	  .u.reg.service_name = "iot",
+	  .u.reg.url = CLIENT3_URL};
+	
+	sock = nn_socket (AF_SP, NN_PULL);
+
+	while(bind == -1)
+        {
+                bind = nn_bind(sock, msg.u.reg.url);
+                sleep(3);
+        }
+	
+	ParodusPrint("Bind returns = %d \n", bind);
+	ParodusPrint("***** Nanomsg client3 in Receiving mode in %s *****\n", msg.u.reg.url);
+	bit = nn_recv (sock, &buf, NN_MSG, 0);
+	ParodusInfo ("----->Received downstream request from server to client3 : \"%s\"\n", (char *)buf);
+	ParodusPrint("Received %d bytes\n", bit);
+	CU_ASSERT(bit >= 0);
+	
+	//Decode and verify downstream request has received by correct registered client
+	
+	wrp_to_struct(buf, bit, WRP_BYTES, &message);		
+	destVal = message->u.req.dest;
+	dest = strtok(destVal , "/");
+	//temp_ptr = strtok(destVal , "/");
+//	ParodusPrint("temp_ptr = %s \n", temp_ptr);
+	strcpy(dest,strtok(NULL , "/"));
+	ParodusInfo("------>decoded dest:%s\n", dest);	
+	CU_ASSERT_STRING_EQUAL( msg.u.reg.service_name, dest );	
+	wrp_free_struct(message);
+	
+	//To send nanomsg client response upstream
+	send_nanomsg_upstream(&buf, bit);
+	
+	rc = nn_freemsg(buf);
+	CU_ASSERT(rc == 0);
+        rc = nn_shutdown(sock, bind);
+        CU_ASSERT(rc == 0);
+	//Need to wait for parodus to finish it's task.
+	sleep(10);
+}
+
+
+void test_nanomsg_downstream_failure()
+{
+	int sock, bind, rc;
+	int bit =0;
+	char *buf =NULL;
+	ParodusError("test_nanomsg_downstream_failure\n");
+	
+	sleep(60);
+	sock = nn_socket (AF_SP, NN_PULL);
+	bind = nn_bind (sock, CLIENT3_URL);
+	CU_ASSERT(bind >= 0);	
+	ParodusPrint("***** Nanomsg client3 in Receiving mode *****\n");
+	
+	bit = nn_recv (sock, &buf, NN_MSG, 0);
+	ParodusInfo ("Received downstream request from server for client3 : \"%s\"\n", buf);
+	CU_ASSERT(bit >= 0);
+	rc = nn_freemsg(buf);
+	CU_ASSERT(rc == 0);
+        rc = nn_shutdown(sock, bind);
+        CU_ASSERT(rc == 0);
+}
+
+
+void test_checkHostIp()
+{
+	int ret;
+	
+	ParodusPrint("**********************************Calling check_host_ip \n");
+	ret = checkHostIp("fabric.webpa.comcast.net");
+	ParodusPrint("------------------> Ret = %d \n", ret);
+	CU_ASSERT_EQUAL(ret, 0);
+	
+}
+
+void test_sendMessage()
+{
+	noPollConnOpts * opts;
+	noPollCtx *ctx = NULL;
+	noPollConn *conn = NULL;
+        
+    ParodusPrint("**********************************Calling sendMessage \n");
+	const char * headerNames[HTTP_CUSTOM_HEADER_COUNT] = {"X-WebPA-Device-Name","X-WebPA-Device-Protocols","User-Agent", "X-WebPA-Convey"};
+	const char * headerValues[HTTP_CUSTOM_HEADER_COUNT];
+
+	headerValues[0] = "123567892366";
+	headerValues[1] = "wrp-0.11,getset-0.1";  
+	headerValues[2] = "WebPA-1.6 (TG1682_DEV_master_2016000000sdy;TG1682/ARRISGroup,Inc.;)";
+	headerValues[3] = "zacbvfxcvglodfjdigjkdshuihgkvn";
+
+	int headerCount = HTTP_CUSTOM_HEADER_COUNT;
+
+	//ctx = nopoll_ctx_new();
+
+	opts = nopoll_conn_opts_new ();
+	nopoll_conn_opts_ssl_peer_verify (opts, nopoll_false);
+	nopoll_conn_opts_set_ssl_protocol (opts, NOPOLL_METHOD_TLSV1_2); 
+	conn = nopoll_conn_tls_new(ctx, opts, "fabric.webpa.comcast.net", "8080", NULL, "/api/v2/device", NULL, NULL, "eth0",
+                                headerNames, headerValues, headerCount);
+	/*while(conn == NULL)
+	{
+		opts = nopoll_conn_opts_new ();
+		nopoll_conn_opts_ssl_peer_verify (opts, nopoll_false);
+		nopoll_conn_opts_set_ssl_protocol (opts, NOPOLL_METHOD_TLSV1_2); 
+		conn = nopoll_conn_tls_new(ctx, opts, "fabric.webpa.comcast.net", 8080, NULL, "/api/v2/device", NULL, NULL, "eth0",
+                                headerNames, headerValues, headerCount);
+	}*/
+
+	ParodusPrint("Sending conn as %p \n", conn);
+	sendMessage(conn, "hello", 6);
+
+}
+
+void test_parseCommandLine()
+{
+    int argc =11;
+    char * command[15]={'\0'};
+     
+    command[0] = "parodus";
+    command[1] = "--hw-model=TG1682";
+    command[2] = "--hw-serial-number=Fer23u948590";
+    command[3] = "--hw-manufacturer=ARRISGroup,Inc.";
+    command[4] = "--hw-mac=123567892366";
+    command[5] = "--hw-last-reboot-reason=unknown";
+    command[6] = "--fw-name=TG1682_DEV_master_2016000000sdy";
+    command[7] = "--webpa-ping-time=180";
+    command[8] = "--webpa-inteface-used=eth0";
+    command[9] = "--webpa-url=fabric.webpa.comcast.net";
+    command[10] = "--webpa-backoff-max=0";
+    
+    ParodusCfg parodusCfg;
+    memset(&parodusCfg,0,sizeof(parodusCfg));
+    ParodusPrint("call parseCommand\n");
+    parseCommandLine(argc,command,&parodusCfg);
+   
+    ParodusPrint("parodusCfg.webpa_ping_timeout is %d\n", parodusCfg.webpa_ping_timeout);
+    ParodusPrint("parodusCfg.webpa_backoff_max is %d\n", parodusCfg.webpa_backoff_max);
+    CU_ASSERT_STRING_EQUAL( parodusCfg.hw_model, "TG1682");
+    CU_ASSERT_STRING_EQUAL( parodusCfg.hw_serial_number, "Fer23u948590");
+    CU_ASSERT_STRING_EQUAL( parodusCfg.hw_manufacturer, "ARRISGroup,Inc.");
+    CU_ASSERT_STRING_EQUAL( parodusCfg.hw_mac, "123567892366");	
+    CU_ASSERT_STRING_EQUAL( parodusCfg.hw_last_reboot_reason, "unknown");	
+    CU_ASSERT_STRING_EQUAL( parodusCfg.fw_name, "TG1682_DEV_master_2016000000sdy");	
+    CU_ASSERT( parodusCfg.webpa_ping_timeout==180);	
+    CU_ASSERT_STRING_EQUAL( parodusCfg.webpa_interface_used, "eth0");	
+    CU_ASSERT_STRING_EQUAL( parodusCfg.webpa_url, "fabric.webpa.comcast.net");
+    CU_ASSERT( parodusCfg.webpa_backoff_max==0);
+}
+
+
+void test_loadParodusCfg()
+{
+	
+	ParodusPrint("Calling test_loadParodusCfg \n");
+	//ParodusCfg parodusCfg, tmpcfg;
+	ParodusCfg  tmpcfg;
+	ParodusCfg *Cfg;
+	Cfg = (ParodusCfg*)malloc(sizeof(ParodusCfg));
+	
+	strcpy(Cfg->hw_model, "TG1682");
+	strcpy(Cfg->hw_serial_number, "Fer23u948590");
+	strcpy(Cfg->hw_manufacturer , "ARRISGroup,Inc.");
+	strcpy(Cfg->hw_mac , "123567892366");
+	memset(&tmpcfg,0,sizeof(tmpcfg));
+	loadParodusCfg(Cfg,&tmpcfg);
+	ParodusInfo("tmpcfg.hw_model = %s, tmpcfg.hw_serial_number = %s, tmpcfg.hw_manufacturer = %s, tmpcfg.hw_mac = %s, \n", tmpcfg.hw_model,tmpcfg.hw_serial_number, tmpcfg.hw_manufacturer,   tmpcfg.hw_mac);
+
+	CU_ASSERT_STRING_EQUAL( tmpcfg.hw_model, "TG1682");
+	CU_ASSERT_STRING_EQUAL( tmpcfg.hw_serial_number, "Fer23u948590");
+	CU_ASSERT_STRING_EQUAL( tmpcfg.hw_manufacturer, "ARRISGroup,Inc.");
+	CU_ASSERT_STRING_EQUAL( tmpcfg.hw_mac, "123567892366");	
+
+}
+
+void add_suites( CU_pSuite *suite )
+{
+    ParodusInfo("--------Start of Test Cases Execution ---------\n");
+    *suite = CU_add_suite( "tests", NULL, NULL );
+    CU_add_test( *suite, "Test 1", test_nanomsg_client_registration1 );
+    CU_add_test( *suite, "Test 2", test_nanomsg_client_registration2 );
+    CU_add_test( *suite, "Test 3", test_nanomsg_client_registration3 );
+    CU_add_test( *suite, "Test 4", test_nanomsg_downstream_success );
+    //CU_add_test( *suite, "Test 5", test_nanomsg_downstream_failure );
+
+    ParodusInfo("-------------Integration testing is completed-----------\n");
+    ParodusInfo("******************************************************************\n");
+    //sleep(10);
+    ParodusInfo("-------------Start of Unit Test Cases Execution---------\n");
+    CU_add_test( *suite, "UnitTest 1", test_parseCommandLine );
+    CU_add_test( *suite, "UnitTest 2", test_checkHostIp );
+	
+    CU_add_test( *suite, "UnitTest 3", test_sendMessage );
+
+    CU_add_test( *suite, "UnitTest 4", test_loadParodusCfg );
+    
+    
+    
+}
+
+
+
+
+/*----------------------------------------------------------------------------*/
+/*                             External Functions                             */
+/*----------------------------------------------------------------------------*/
+int main( void )
+{
+    	pid_t pid, pid1;
+    	char value[512] = {'\0'};
+  	char* data =NULL;
+  	int status;
+	char commandUrl[255];
+	pid_t curl_pid;
+  
+	char * command[] = {"parodus","--hw-model=TG1682", "--hw-serial-number=Fer23u948590","--hw-manufacturer=ARRISGroup,Inc.","--hw-mac=123567892366","--hw-last-reboot-reason=unknown","--fw-name=TG1682_DEV_master_2016000000sdy","--boot-time=10","--webpa-ping-time=180","--webpa-inteface-used=eth0","--webpa-url=fabric-cd.webpa.comcast.net","--webpa-backoff-max=9", NULL};
+
+	//int size = sizeof(command)/sizeof(command[0]);
+	//int i;
+	//ParodusInfo("commad: ");
+        //for(i=0;i<size-1;i++)
+        //ParodusInfo("command:%s",command);
+
+    	ParodusInfo("Starting parodus process \n");
+	const char *s = getenv("WEBPA_AUTH_HEADER");
+
+	sprintf(commandUrl, "curl -i -H \"Authorization:Basic %s\" -H \"Accept: application/json\" -w %%{time_total} -k \"https://api-cd.webpa.comcast.net:8090/api/v2/device/mac:123567892366/iot?names=Device.DeviceInfo.Webpa.X_COMCAST-COM_SyncProtocolVersion\"", s);	
+	ParodusPrint("---------------------->>>>Executing system(commandUrl)\n");
+	
+	curl_pid = getpid();
+	ParodusPrint("child process execution with curl_pid:%d\n", curl_pid);
+	pid = fork();
+	if (pid == -1)
+	{
+		ParodusError("fork was unsuccessful for pid (errno=%d, %s)\n",errno, strerror(errno));
+		return -1;
+	}
+	else if (pid == 0)
+	{
+		int err;
+		ParodusPrint("child process created for parodus\n");
+		pid = getpid();
+		ParodusPrint("child process execution with pid:%d\n", pid);
+		
+		err = execv("../src/parodus", command);
+		if(errno == 2)
+		{
+			err = execv("./src/parodus", command);
+		}
+		ParodusError("err is %d, errno is %d\n",err, errno);		
+	
+	}
+	else if (pid > 0)
+	{
+		int link[2];
+		sleep(5);
+		
+		//Starting test suites execution in new thread
+		ParodusPrint("Creating new thread for test suite execution\n");
+	
+		pthread_t testId;
+		int err1 = 0;
+		err1 = pthread_create(&testId,NULL,handle_testsuites,(void *)&pid);
+		if(err1 != 0)
+			ParodusError("Error creating test suite thread %s\n",strerror(err1));
+		else
+			ParodusPrint("test suite thread created successfully\n");
+			
+	  	if (pipe(link)==-1)
+	  	{
+	    		ParodusError("Failed to create pipe\n");
+	  	}
+	  	else
+	  		ParodusPrint("Created pipe to read curl output\n");
+
+		pid1 = fork();
+		if (pid1 == -1)
+		{
+			ParodusError("fork was unsuccessful for pid1 (errno=%d, %s)\n",errno, strerror(errno));
+			return -1;
+		}
+		else if(pid1 == 0) 
+		{
+			while(NULL == fopen("/tmp/parodus_ready", "r"))
+			{
+				sleep(5);
+			}
+	    		dup2 (link[1], STDOUT_FILENO);
+	    		close(link[0]);
+	    		close(link[1]);
+			sleep(40);
+			system(commandUrl);			
+			ParodusInfo("\n----Executed first Curl request for downstream ------- \n");
+		}
+	
+		else if(pid1 > 0)
+		{
+			//wait fro child process to finish and read from pipe
+			waitpid(pid1, &status, 0);
+			//reading from pipe
+			ParodusPrint("parent process...:%d\n", pid1);
+			close(link[1]);
+			int nbytes = read(link[0], value, sizeof(value));
+			ParodusPrint("Read %d \n", nbytes);
+			   
+		      	if ((data = strstr(value, "message:Success")) !=NULL)
+		      	{
+		      		ParodusInfo("curl success\n");
+		      	}
+		      	else
+		      	{
+		      		ParodusError("curl failure..\n");
+		      	}
+	    		while(1);
+		}
+	}	
+return 0;
+}
+
+
+void *handle_testsuites(void* pid)
+{
+	unsigned rv = 1;
+	CU_pSuite suite = NULL;
+	pid_t pid_parodus = *((int *)pid);
+	
+	ParodusPrint("Starting handle_testsuites thread\n");
+	sleep(25);
+
+    	if( CUE_SUCCESS == CU_initialize_registry() ) 
+    	{
+		add_suites( &suite );
+		if( NULL != suite ) 
+		{
+		    CU_basic_set_mode( CU_BRM_VERBOSE );
+		    CU_basic_run_tests();
+		    ParodusPrint( "\n" );
+		    CU_basic_show_failures( CU_get_failure_list() );
+		    ParodusPrint( "\n\n" );
+		    rv = CU_get_number_of_tests_failed();
+		}
+		CU_cleanup_registry();
+    	}
+    	kill(pid_parodus, SIGKILL);
+	ParodusInfo("parodus process with pid %d is stopped\n", pid_parodus);
+		
+    	if( 0 != rv ) 
+	{
+		_exit(-1);
+	}
+	
+	_exit(0);
+}
+
+
+static void send_nanomsg_upstream(void **buf, int size)
+{
+	/**** To send nanomsg response to server ****/
+	int rv;		  
+	void *bytes;
+	int resp_size;
+	int sock;
+	int byte;
+	wrp_msg_t *message;
+	
+	ParodusInfo("Decoding downstream request received from server\n");
+	rv = wrp_to_struct(*buf, size, WRP_BYTES, &message);
+	ParodusPrint("after downstream req decode:%d\n", rv);	
+	/**** Preparing Nanomsg client response ****/
+	wrp_msg_t resp_m;	
+	resp_m.msg_type = WRP_MSG_TYPE__REQ;
+	ParodusPrint("resp_m.msg_type:%d\n", resp_m.msg_type);
+	
+        resp_m.u.req.source = message->u.req.dest;        
+        ParodusPrint("------resp_m.u.req.source is:%s\n", resp_m.u.req.source);
+        
+        resp_m.u.req.dest = message->u.req.source;
+        ParodusPrint("------resp_m.u.req.dest is:%s\n", resp_m.u.req.dest);
+        
+        resp_m.u.req.transaction_uuid = message->u.req.transaction_uuid;
+        ParodusPrint("------resp_m.u.req.transaction_uuid is:%s\n", resp_m.u.req.transaction_uuid);
+        
+        resp_m.u.req.headers = NULL;
+        resp_m.u.req.payload = "{statusCode:200,message:Success}";
+        ParodusPrint("------resp_m.u.req.payload is:%s\n", (char *)resp_m.u.req.payload);
+        resp_m.u.req.payload_size = strlen(resp_m.u.req.payload);
+        
+        resp_m.u.req.metadata = NULL;
+        resp_m.u.req.include_spans = false;
+        resp_m.u.req.spans.spans = NULL;
+        resp_m.u.req.spans.count = 0;
+     		
+	ParodusPrint("Encoding downstream response\n");
+	resp_size = wrp_struct_to( &resp_m, WRP_BYTES, &bytes );
+
+	/*** Enable this to verify downstream response by decoding ***/
+	/***
+	wrp_msg_t *message1;
+	rv = wrp_to_struct(bytes, resp_size, WRP_BYTES, &message1);
+	ParodusPrint("after downstream response decode:%d\n", rv);	
+	ParodusPrint("downstream response decoded msgType:%d\n", message1->msg_type);
+	ParodusPrint("downstream response decoded source:%s\n", message1->u.req.source);
+	ParodusPrint("downstream response decoded dest:%s\n", message1->u.req.dest);
+	ParodusPrint("downstream response decoded transaction_uuid:%s\n", message1->u.req.transaction_uuid);
+	ParodusPrint("downstream response decoded payload:%s\n", (char*)message1->u.req.payload);       
+        wrp_free_struct(message1);
+        ***/
+        
+        /**** Nanomsg client sending msgs ****/
+		
+	sock = nn_socket (AF_SP, NN_PUSH);
+	int connect = nn_connect (sock, ENDPOINT);
+	CU_ASSERT(connect >= 0);	
+	sleep(1);
+	
+	ParodusInfo("nanomsg client sending response upstream\n");
+	byte = nn_send (sock, bytes, resp_size,0);
+	ParodusInfo("----->Expected byte to be sent:%d\n", resp_size);
+	ParodusInfo("----->actual byte sent:%d\n", byte);
+	CU_ASSERT(byte==resp_size );
+	wrp_free_struct(message);
+	
+	free(bytes);
+	ParodusPrint("---- End of send_nanomsg_upstream ----\n");
+
+}
+
+
--- a/tests/simple_connection.c
+++ b/tests/simple_connection.c
@@ -59,45 +59,45 @@ void test_set_global_conn()
    set_global_conn(conn);
    CU_ASSERT(conn == get_global_conn());
    close_and_unref_connection(get_global_conn());
-    free(opts);
 }

 void test_set_parodus_cfg()
 {
-    ParodusCfg cfg;
+    ParodusCfg *cfg;

-    parStrncpy(cfg.hw_model, "TG1682", sizeof(cfg.hw_model));
-    parStrncpy(cfg.hw_serial_number, "Fer23u948590", sizeof(cfg.hw_serial_number));
-    parStrncpy(cfg.hw_manufacturer , "ARRISGroup,Inc.", sizeof(cfg.hw_manufacturer));
-    parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
-    parStrncpy(cfg.hw_last_reboot_reason , "unknown", sizeof(cfg.hw_last_reboot_reason));
-    parStrncpy(cfg.fw_name , "2.364s2", sizeof(cfg.fw_name));
-    parStrncpy(cfg.webpa_path_url , "/api/v2/device", sizeof(cfg.webpa_path_url));
-    parStrncpy(cfg.webpa_url , "fabric-cd.webpa.comcast.net", sizeof(cfg.webpa_url));
-    parStrncpy(cfg.webpa_interface_used , "eth0", sizeof(cfg.webpa_interface_used));
-    parStrncpy(cfg.webpa_protocol , "WebPA-1.6", sizeof(cfg.webpa_protocol));
-    parStrncpy(cfg.webpa_uuid , "1234567-345456546", sizeof(cfg.webpa_uuid));
-    cfg.secureFlag = 1;
-    cfg.boot_time = 423457;
-    cfg.webpa_ping_timeout = 30;
-    cfg.webpa_backoff_max = 255;
+    cfg = (ParodusCfg*)malloc(sizeof(ParodusCfg));
+    strcpy(cfg->hw_model, "TG1682");
+    strcpy(cfg->hw_serial_number, "Fer23u948590");
+    strcpy(cfg->hw_manufacturer , "ARRISGroup,Inc.");
+    strcpy(cfg->hw_mac , "123567892366");
+    strcpy(cfg->hw_last_reboot_reason , "unknown");
+    strcpy(cfg->fw_name , "2.364s2");
+    strcpy(cfg->webpa_path_url , "/api/v2/device");
+    strcpy(cfg->webpa_url , "fabric-cd.webpa.comcast.net");
+    strcpy(cfg->webpa_interface_used , "eth0");
+    strcpy(cfg->webpa_protocol , "WebPA-1.6");
+    strcpy(cfg->webpa_uuid , "1234567-345456546");
+    cfg->secureFlag = 1;
+    cfg->boot_time = 423457;
+    cfg->webpa_ping_timeout = 30;
+    cfg->webpa_backoff_max = 255;

-    set_parodus_cfg(&cfg);
+    set_parodus_cfg(cfg);

-    CU_ASSERT_STRING_EQUAL(cfg.hw_model, get_parodus_cfg()->hw_model);
-    CU_ASSERT_STRING_EQUAL(cfg.webpa_uuid, get_parodus_cfg()->webpa_uuid);
-    CU_ASSERT_STRING_EQUAL(cfg.hw_serial_number, get_parodus_cfg()->hw_serial_number);
-    CU_ASSERT_STRING_EQUAL(cfg.hw_manufacturer , get_parodus_cfg()->hw_manufacturer);
-    CU_ASSERT_STRING_EQUAL(cfg.hw_mac, get_parodus_cfg()->hw_mac);
-    CU_ASSERT_STRING_EQUAL(cfg.hw_last_reboot_reason,get_parodus_cfg()->hw_last_reboot_reason);
-    CU_ASSERT_STRING_EQUAL(cfg.fw_name,get_parodus_cfg()->fw_name);
-    CU_ASSERT_STRING_EQUAL(cfg.webpa_url, get_parodus_cfg()->webpa_url);
-    CU_ASSERT_STRING_EQUAL(cfg.webpa_interface_used , get_parodus_cfg()->webpa_interface_used);
-    CU_ASSERT_STRING_EQUAL(cfg.webpa_protocol, get_parodus_cfg()->webpa_protocol);
-    CU_ASSERT_EQUAL(cfg.boot_time, get_parodus_cfg()->boot_time);
-    CU_ASSERT_EQUAL(cfg.webpa_ping_timeout, get_parodus_cfg()->webpa_ping_timeout);
-    CU_ASSERT_EQUAL(cfg.webpa_backoff_max, get_parodus_cfg()->webpa_backoff_max);
-    CU_ASSERT_EQUAL(cfg.secureFlag, get_parodus_cfg()->secureFlag);
+    CU_ASSERT_STRING_EQUAL(cfg->hw_model, get_parodus_cfg()->hw_model);
+    CU_ASSERT_STRING_EQUAL(cfg->webpa_uuid, get_parodus_cfg()->webpa_uuid);
+    CU_ASSERT_STRING_EQUAL(cfg->hw_serial_number, get_parodus_cfg()->hw_serial_number);
+    CU_ASSERT_STRING_EQUAL(cfg->hw_manufacturer , get_parodus_cfg()->hw_manufacturer);
+    CU_ASSERT_STRING_EQUAL(cfg->hw_mac, get_parodus_cfg()->hw_mac);
+    CU_ASSERT_STRING_EQUAL(cfg->hw_last_reboot_reason,get_parodus_cfg()->hw_last_reboot_reason);
+    CU_ASSERT_STRING_EQUAL(cfg->fw_name,get_parodus_cfg()->fw_name);
+    CU_ASSERT_STRING_EQUAL(cfg->webpa_url, get_parodus_cfg()->webpa_url);
+    CU_ASSERT_STRING_EQUAL(cfg->webpa_interface_used , get_parodus_cfg()->webpa_interface_used);
+    CU_ASSERT_STRING_EQUAL(cfg->webpa_protocol, get_parodus_cfg()->webpa_protocol);
+    CU_ASSERT_EQUAL(cfg->boot_time, get_parodus_cfg()->boot_time);
+    CU_ASSERT_EQUAL(cfg->webpa_ping_timeout, get_parodus_cfg()->webpa_ping_timeout);
+    CU_ASSERT_EQUAL(cfg->webpa_backoff_max, get_parodus_cfg()->webpa_backoff_max);
+    CU_ASSERT_EQUAL(cfg->secureFlag, get_parodus_cfg()->secureFlag);
 }

 void test_getWebpaConveyHeader()
@@ -117,7 +117,6 @@ void test_getWebpaConveyHeader()
    CU_ASSERT_STRING_EQUAL(get_parodus_cfg()->webpa_protocol, cJSON_GetObjectItem(payload, WEBPA_PROTOCOL)->valuestring);
    CU_ASSERT_EQUAL((int)get_parodus_cfg()->boot_time, cJSON_GetObjectItem(payload, BOOT_TIME)->valueint);

-    cJSON_Delete(payload);
 }

 void test_createSecureConnection()
@@ -176,7 +175,7 @@ void test_WebpaConveyHeaderWithNullValues()
    CU_ASSERT_PTR_NULL(cJSON_GetObjectItem(payload, FIRMWARE_NAME));
    CU_ASSERT_PTR_NULL(cJSON_GetObjectItem(payload, WEBPA_INTERFACE));
    free(cfg);
-    cJSON_Delete(payload);
+    
 }

 void add_suites( CU_pSuite *suite )
--- a/tests/test_ParodusInternal.c
+++ b/tests/test_ParodusInternal.c
@@ -39,7 +39,7 @@ bool LastReasonStatus;
 nopoll_bool nopoll_base64_encode(const char *content,int length,char *output, int *output_size)
 {
    UNUSED(content); UNUSED(length);  UNUSED(output_size);
-    parStrncpy(output, "AWYFUJHUDUDKJDDRDKUIIKORE\nSFJLIRRSHLOUTDESTDJJITTESLOIUHJGDRS\nGIUY&%WSJ", (size_t) *output_size);
+    strcpy(output, "AWYFUJHUDUDKJDDRDKUIIKORE\nSFJLIRRSHLOUTDESTDJJITTESLOIUHJGDRS\nGIUY&%WSJ");
    function_called();
    return (nopoll_bool)(intptr_t)mock();
 }
@@ -56,19 +56,19 @@ char *get_global_reconnect_reason()
 void test_getWebpaConveyHeader()
 {
    ParodusCfg cfg;
-    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));
-    parStrncpy(cfg.hw_manufacturer , "ARRISGroup,Inc.", sizeof(cfg.hw_manufacturer));
-    parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
-    parStrncpy(cfg.hw_last_reboot_reason , "unknown", sizeof(cfg.hw_last_reboot_reason));
-    parStrncpy(cfg.fw_name , "2.364s2", sizeof(cfg.fw_name));
-    parStrncpy(cfg.webpa_path_url , "/api/v2/device", sizeof(cfg.webpa_path_url));
-    parStrncpy(cfg.webpa_url , "localhost", sizeof(cfg.webpa_url));
-    parStrncpy(cfg.webpa_interface_used , "eth0", sizeof(cfg.webpa_interface_used));
-    parStrncpy(cfg.webpa_protocol , "WebPA-1.6", sizeof(cfg.webpa_protocol));
-    parStrncpy(cfg.webpa_uuid , "1234567-345456546", sizeof(cfg.webpa_uuid));
-    cfg.flags = 0;
+
+    strcpy(cfg.hw_model, "TG1682");
+    strcpy(cfg.hw_serial_number, "Fer23u948590");
+    strcpy(cfg.hw_manufacturer , "ARRISGroup,Inc.");
+    strcpy(cfg.hw_mac , "123567892366");
+    strcpy(cfg.hw_last_reboot_reason , "unknown");
+    strcpy(cfg.fw_name , "2.364s2");
+    strcpy(cfg.webpa_path_url , "/api/v2/device");
+    strcpy(cfg.webpa_url , "localhost");
+    strcpy(cfg.webpa_interface_used , "eth0");
+    strcpy(cfg.webpa_protocol , "WebPA-1.6");
+    strcpy(cfg.webpa_uuid , "1234567-345456546");
+    cfg.secureFlag = 1;
    cfg.boot_time = 423457;
    cfg.webpa_ping_timeout = 30;
    cfg.webpa_backoff_max = 255;
@@ -95,38 +95,6 @@ void err_getWebpaConveyHeader()
    getWebpaConveyHeader();
 }

-/*
-*	Test function to verify timespec_diff function
-*	Verifys when the time diff is positive ie stop time > start time
-*/
-void test_timespec_diff()
-{
-    struct timespec start, stop, diff;
-    int time_taken_ms;
-    clock_gettime(CLOCK_REALTIME, &start);
-    sleep(1);
-    clock_gettime(CLOCK_REALTIME, &stop);
-    timespec_diff(&start, &stop, &diff);
-    time_taken_ms = diff.tv_sec * 1000 + (diff.tv_nsec / 1000000);
-    assert_true(time_taken_ms >= 0);
-}
-
-/*
-*	Test function to verify timespec_diff function
-*	Verifys when the time diff is negative ie stop time < start time
-*/
-void test_timespec_diff1()
-{
-    struct timespec start, stop, diff;
-    int time_taken_ms;
-    clock_gettime(CLOCK_REALTIME, &start);
-    sleep(1);
-    clock_gettime(CLOCK_REALTIME, &stop);
-    timespec_diff(&stop, &start, &diff);
-    time_taken_ms = diff.tv_sec * 1000 + (diff.tv_nsec / 1000000);
-    assert_true(time_taken_ms <= 0);
-}
-
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
@@ -135,8 +103,6 @@ int main(void)
    const struct CMUnitTest tests[] = {
        cmocka_unit_test(test_getWebpaConveyHeader),
        cmocka_unit_test(err_getWebpaConveyHeader),
-        cmocka_unit_test(test_timespec_diff),
-        cmocka_unit_test(test_timespec_diff1),
    };

    return cmocka_run_group_tests(tests, NULL, NULL);
--- a/tests/test_client_list.c
+++ b/tests/test_client_list.c
@@ -26,9 +26,6 @@
 #define TEST_CLIENT1_URL "tcp://127.0.0.1:6677"
 #define TEST_CLIENT2_URL "tcp://127.0.0.1:6655"

-pthread_t test_tid;
-pthread_t test_tid2;
-
 static void *client_rcv_task();
 static void *client2_rcv_task();

@@ -61,7 +58,7 @@ void test_client_addtolist()
 	ParodusPrint("decoded service_name:%s\n", message->u.reg.service_name);
 	ParodusPrint("decoded dest:%s\n", message->u.reg.url);
 	
-	StartThread(client_rcv_task, &test_tid);
+	StartThread(client_rcv_task);
 	
 	status = addToList(&message);
 	ParodusPrint("addToList status is %d\n", status);
@@ -76,9 +73,8 @@ void test_client_addtolist()
 		CU_ASSERT_STRING_EQUAL( temp->service_name, message->u.reg.service_name );
 		CU_ASSERT_STRING_EQUAL( temp->url, message->u.reg.url );
 	}
-	release_global_node ();
+
 	wrp_free_struct(message);
-	free(bytes);
 	ParodusInfo("test_client_addtolist done..\n");	
 	
 }
@@ -90,23 +86,13 @@ static void *client_rcv_task()
 	int byte =0;
 	int rv1=0;
 	int t=25000;
-	int rc = -1;
-	int bind;
 	wrp_msg_t  *msg1;

 	int sock1 = nn_socket (AF_SP, NN_PULL);
-	bind = nn_bind(sock1, TEST_CLIENT1_URL);
-	if(bind < 0)
-        {
-            ParodusError("Unable to bind socket (errno=%d, %s)\n",errno, strerror(errno));
-        }
+	nn_bind(sock1, TEST_CLIENT1_URL);
 	
 	void *buf = NULL;
-	rc = nn_setsockopt(sock1, NN_SOL_SOCKET, NN_RCVTIMEO, &t, sizeof(t));
-	if(rc < 0)
-        {
-        	ParodusError ("Unable to set socket timeout (errno=%d, %s)\n",errno, strerror(errno));
-        }
+	nn_setsockopt(sock1, NN_SOL_SOCKET, NN_RCVTIMEO, &t, sizeof(t));
 	
 	ParodusPrint("Client 1 waiting for acknowledgement \n");
 	byte = nn_recv(sock1, &buf, NN_MSG, 0);
@@ -132,23 +118,13 @@ static void *client2_rcv_task()
 	int byte =0;
 	int rv1=0;
 	int t=25000;
-	int rc = -1;
-	int bind;
 	wrp_msg_t  *msg1;

 	int sock1 = nn_socket (AF_SP, NN_PULL);
-	bind = nn_bind(sock1, TEST_CLIENT2_URL);
-	if(bind < 0)
-        {
-            ParodusError("Unable to bind socket (errno=%d, %s)\n",errno, strerror(errno));
-        }
+	nn_bind(sock1, TEST_CLIENT2_URL);
 	
 	void *buf = NULL;
-	rc = nn_setsockopt(sock1, NN_SOL_SOCKET, NN_RCVTIMEO, &t, sizeof(t));
-	if(rc < 0)
-        {
-                ParodusError ("Unable to set socket timeout (errno=%d, %s)\n",errno, strerror(errno));
-        }
+	nn_setsockopt(sock1, NN_SOL_SOCKET, NN_RCVTIMEO, &t, sizeof(t));
 	
 	ParodusPrint("Client 2 waiting for acknowledgement \n");
 	byte = nn_recv(sock1, &buf, NN_MSG, 0);
@@ -192,7 +168,7 @@ void test_addtolist_multiple_clients()
 	ParodusPrint("decoded service_name:%s\n", message->u.reg.service_name);
 	ParodusPrint("decoded dest:%s\n", message->u.reg.url);
 	
-	StartThread(client2_rcv_task, &test_tid2);
+	StartThread(client2_rcv_task);
 	
 	status = addToList(&message);
 	ParodusPrint("addToList status is %d\n", status);
@@ -209,9 +185,8 @@ void test_addtolist_multiple_clients()
 		CU_ASSERT_STRING_EQUAL( temp->url, message->u.reg.url );
 		
 	}
-	release_global_node ();
+
 	wrp_free_struct(message);
-	free(bytes);
 	ParodusInfo("test_addtolist_multiple_clients done..\n");	
 	
 }
--- a/tests/test_close_retry.c
+++ b/tests/test_close_retry.c
@@ -1,93 +0,0 @@
-/**
- * Copyright 2018 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 <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
-#include <pthread.h>
-
-#include "../src/close_retry.h"
-#include "../src/parodus_log.h"
-
-/*----------------------------------------------------------------------------*/
-/*                                   Tests                                    */
-/*----------------------------------------------------------------------------*/
-void test_close_retry() {
-	/* get close_retry initial value */
-	bool close_retry =false;
-	close_retry = get_close_retry();
-	ParodusInfo("close_retry initial value is: %d\n", close_retry);
-	assert_int_equal(close_retry, 0);
-
-	/* set close_retry value and check whether its returning modified value or not*/
-	set_close_retry();
-	close_retry = get_close_retry();
-	ParodusInfo("close_retry modified to: %d\n", close_retry);
-	assert_int_equal(close_retry,1);
-
-	/* reset close_retry */
-	reset_close_retry();
-	close_retry = get_close_retry();
-	ParodusInfo("close_retry reset to: %d\n", close_retry);
-	assert_int_equal(close_retry,0);
-}
-
-void *test_mutex_set_close_retry() {
-	set_close_retry();
-	return NULL;
-}
-
-void *test_mutex_reset_close_retry() {
-	reset_close_retry();
-	return NULL;
-}
-
-void test_mutex_close_retry() {
-	bool close_retry;
-	pthread_t thread[3];
-
-	pthread_create(&thread[0], NULL, test_mutex_set_close_retry, NULL);
-	pthread_create(&thread[1], NULL, test_mutex_set_close_retry, NULL);
-
-	pthread_join(thread[0], NULL);
-	pthread_join(thread[1], NULL);
-
-	/* After execution of threads check the value of close_retry */
-	close_retry = get_close_retry();
-	ParodusInfo("Threads execution is completed, close_retry is: %d\n", close_retry);
-	assert_int_equal(close_retry, 1);
-
-	pthread_create(&thread[2], NULL, test_mutex_reset_close_retry, NULL);
-	pthread_join(thread[2], NULL);
-
-	close_retry = get_close_retry();
-	ParodusInfo("close_retry reset to: %d\n", close_retry);
-	assert_int_equal(close_retry, 0);
-}
-
-/*----------------------------------------------------------------------------*/
-/*                             External Functions                             */
-/*----------------------------------------------------------------------------*/
-int main(void)
-{
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test(test_close_retry),
-        cmocka_unit_test(test_mutex_close_retry)
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
--- a/tests/test_config.c
+++ b/tests/test_config.c
@@ -25,71 +25,42 @@
 #include <CUnit/Basic.h>

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

-extern int parse_mac_address (char *target, const char *arg);
-extern int server_is_http (const char *full_url,
-	const char **server_ptr);
-extern int parse_webpa_url__(const char *full_url, 
-	char *server_addr, int server_addr_buflen,
-	char *port_buf, int port_buflen);
-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);
+#define K_argc 15

 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/
-void create_token_script(char *fname)
-{
-    char command[128] = {'\0'};
-    FILE *fp = fopen(fname, "w");
-    assert_non_null(fp);
-    fprintf(fp, "%s", "printf secure-token-$1-$2");
-    fclose(fp);
-    sprintf(command, "chmod +x %s",fname);
-    system(command);
-}
+
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/
-
 void test_setParodusConfig()
 {
    ParodusCfg cfg;
    memset(&cfg,0,sizeof(cfg));

-    parStrncpy(cfg.hw_model, "TG1682", sizeof(cfg.hw_model));
-    parStrncpy(cfg.hw_serial_number, "Fer23u948590", sizeof(cfg.hw_serial_number));
-    parStrncpy(cfg.hw_manufacturer , "ARRISGroup,Inc.", sizeof(cfg.hw_manufacturer));
-    parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
-    parStrncpy(cfg.hw_last_reboot_reason , "unknown", sizeof(cfg.hw_last_reboot_reason));
-    parStrncpy(cfg.fw_name , "2.364s2", sizeof(cfg.fw_name));
-    parStrncpy(cfg.webpa_path_url , "/v1", sizeof(cfg.webpa_path_url));
-    parStrncpy(cfg.webpa_url , "http://127.0.0.1", sizeof(cfg.webpa_url));
-    parStrncpy(cfg.webpa_interface_used , "eth0", sizeof(cfg.webpa_interface_used));
-    parStrncpy(cfg.webpa_protocol , "WebPA-1.6", sizeof(cfg.webpa_protocol));
-    parStrncpy(cfg.webpa_uuid , "1234567-345456546", sizeof(cfg.webpa_uuid));
-    parStrncpy(cfg.partner_id , "mycom", sizeof(cfg.partner_id));
-#ifdef ENABLE_SESHAT
-    parStrncpy(cfg.seshat_url, "ipc://tmp/seshat_service.url", sizeof(cfg.seshat_url));
-#endif
-    cfg.flags = 0;
+    strcpy(cfg.hw_model, "TG1682");
+    strcpy(cfg.hw_serial_number, "Fer23u948590");
+    strcpy(cfg.hw_manufacturer , "ARRISGroup,Inc.");
+    strcpy(cfg.hw_mac , "123567892366");
+    strcpy(cfg.hw_last_reboot_reason , "unknown");
+    strcpy(cfg.fw_name , "2.364s2");
+    strcpy(cfg.webpa_path_url , "/v1");
+    strcpy(cfg.webpa_url , "localhost");
+    strcpy(cfg.webpa_interface_used , "eth0");
+    strcpy(cfg.webpa_protocol , "WebPA-1.6");
+    strcpy(cfg.webpa_uuid , "1234567-345456546");
+    strcpy(cfg.partner_id , "comcast");
+    strcpy(cfg.seshat_url, "ipc://tmp/seshat_service.url");
+    cfg.secureFlag = 1;
    cfg.boot_time = 423457;
    cfg.webpa_ping_timeout = 30;
    cfg.webpa_backoff_max = 255;
-#ifdef FEATURE_DNS_QUERY
-    cfg.acquire_jwt = 1;
-    parStrncpy(cfg.dns_txt_url, "test",sizeof(cfg.dns_txt_url));
-    cfg.jwt_algo = 1025;
-    parStrncpy(cfg.jwt_key, "key.txt",sizeof(cfg.jwt_key));
-#endif 
-	cfg.crud_config_file = strdup("parodus_cfg.json");
-	set_parodus_cfg(&cfg);
-	ParodusCfg *temp = get_parodus_cfg();
+    
+    set_parodus_cfg(&cfg);
+
+    ParodusCfg *temp = get_parodus_cfg();

    assert_string_equal(cfg.hw_model, temp->hw_model);
    assert_string_equal(cfg.hw_serial_number, temp->hw_serial_number);
@@ -102,20 +73,13 @@ void test_setParodusConfig()
    assert_string_equal(cfg.webpa_protocol, temp->webpa_protocol);
    assert_string_equal(cfg.webpa_uuid, temp->webpa_uuid);
    assert_string_equal(cfg.partner_id, temp->partner_id);
-#ifdef ENABLE_SESHAT
    assert_string_equal(cfg.seshat_url, temp->seshat_url);
-#endif
-    assert_int_equal((int) cfg.flags, (int) temp->flags);
+
+
+    assert_int_equal((int) cfg.secureFlag, (int) temp->secureFlag);
    assert_int_equal((int) cfg.boot_time, (int) temp->boot_time);
    assert_int_equal((int) cfg.webpa_ping_timeout, (int) temp->webpa_ping_timeout);
    assert_int_equal((int) cfg.webpa_backoff_max, (int) temp->webpa_backoff_max);
-#ifdef FEATURE_DNS_QUERY
-    assert_int_equal( (int) cfg.acquire_jwt, (int) temp->acquire_jwt);
-    assert_string_equal(cfg.dns_txt_url, temp->dns_txt_url);
-    assert_int_equal( (int) cfg.jwt_algo, (int) temp->jwt_algo);
-    assert_string_equal(cfg.jwt_key, temp->jwt_key);
-#endif
-	assert_string_equal(cfg.crud_config_file, temp->crud_config_file);
 }

 void test_getParodusConfig()
@@ -123,7 +87,7 @@ void test_getParodusConfig()
    ParodusCfg cfg;
    memset(&cfg,0,sizeof(cfg));

-    parStrncpy(cfg.hw_model, "TG1682133",sizeof(cfg.hw_model));
+    strcpy(cfg.hw_model, "TG1682133");
    set_parodus_cfg(&cfg);

    ParodusCfg *temp = get_parodus_cfg();
@@ -131,81 +95,33 @@ void test_getParodusConfig()
    assert_string_equal(cfg.hw_model, temp->hw_model);
 }

-static int open_output_file (const char *fname)
-{
-  int fd = open(fname, O_WRONLY | O_CREAT, 0666);
-  if (fd<0)
-  {
-    ParodusError ("File %s open error\n", fname);
-    abort ();
-  }
-  return fd;
-} 
-
-void write_key_to_file (const char *fname, const char *buf)
-{
-  ssize_t nbytes;
-  ssize_t buflen = strlen (buf);
-  int fd = open_output_file(fname);
-  nbytes = write(fd, buf, buflen);
-  if (nbytes < 0)
-  {
-    ParodusError ("Write file %s error\n", fname);
-    close(fd);
-    abort ();
-  }
-  close(fd);
-  ParodusInfo ("%d bytes written\n", nbytes);
-}
-
 void test_parseCommandLine()
 {
-    char expectedToken[1280] = {'\0'};
-#ifdef FEATURE_DNS_QUERY    
-	const char *jwt_key =	"AGdyuwyhwl2ow2ydsoioiygkshwdthuwd";
-#endif
+    int argc =K_argc;
+    char * command[argc+1];
+    int i = 0;

-    char *command[] = {"parodus",
-		"--hw-model=TG1682",
-		"--hw-serial-number=Fer23u948590",
-		"--hw-manufacturer=ARRISGroup,Inc.",
-		"--hw-mac=123567892366",
-		"--hw-last-reboot-reason=unknown",
-		"--fw-name=TG1682_DEV_master_2016000000sdy",
-		"--webpa-ping-timeout=180",
-		"--webpa-interface-used=br0",
-		"--webpa-url=http://127.0.0.1",
-		"--webpa-backoff-max=0",
-		"--boot-time=1234",
-		"--parodus-local-url=tcp://127.0.0.1:6666",
-		"--partner-id=cox",
-#ifdef ENABLE_SESHAT
-		"--seshat-url=ipc://127.0.0.1:7777",
-#endif
-		"--force-ipv4",
-		"--force-ipv6",
-		"--token-read-script=/tmp/token.sh",
-		"--token-acquisition-script=/tmp/token.sh",
-		"--ssl-cert-path=/etc/ssl/certs/ca-certificates.crt",
-#ifdef FEATURE_DNS_QUERY
-		"--acquire-jwt=1",
-		"--dns-txt-url=mydns.mycom.net",
-		"--jwt-public-key-file=../../tests/jwt_key.tst",
-		"--jwt-algo=RS256",
-#endif
-		"--crud-config-file=parodus_cfg.json",
-		NULL
-	};
-	int argc = (sizeof (command) / sizeof (char *)) - 1;
+    command[i++] = "parodus";
+    command[i++] = "--hw-model=TG1682";
+    command[i++] = "--hw-serial-number=Fer23u948590";
+    command[i++] = "--hw-manufacturer=ARRISGroup,Inc.";
+    command[i++] = "--hw-mac=123567892366";
+    command[i++] = "--hw-last-reboot-reason=unknown";
+    command[i++] = "--fw-name=TG1682_DEV_master_2016000000sdy";
+    command[i++] = "--webpa-ping-time=180";
+    command[i++] = "--webpa-inteface-used=br0";
+    command[i++] = "--webpa-url=localhost";
+    command[i++] = "--webpa-backoff-max=0";
+    command[i++] = "--boot-time=1234";
+    command[i++] = "--parodus-local-url=tcp://127.0.0.1:6666";
+    command[i++] = "--partner-id=cox";
+    command[i++] = "--seshat-url=ipc://127.0.0.1:7777";
+    command[i] = '\0';

    ParodusCfg parodusCfg;
    memset(&parodusCfg,0,sizeof(parodusCfg));

-#ifdef FEATURE_DNS_QUERY
-	write_key_to_file ("../../tests/jwt_key.tst", jwt_key);
-#endif
-    create_token_script("/tmp/token.sh");
-    assert_int_equal (parseCommandLine(argc,command,&parodusCfg), 0);
+    parseCommandLine(argc,command,&parodusCfg);

    assert_string_equal( parodusCfg.hw_model, "TG1682");
    assert_string_equal( parodusCfg.hw_serial_number, "Fer23u948590");
@@ -215,115 +131,56 @@ void test_parseCommandLine()
    assert_string_equal( parodusCfg.fw_name, "TG1682_DEV_master_2016000000sdy");	
    assert_int_equal( (int) parodusCfg.webpa_ping_timeout,180);	
    assert_string_equal( parodusCfg.webpa_interface_used, "br0");	
-    assert_string_equal( parodusCfg.webpa_url, "http://127.0.0.1");
+    assert_string_equal( parodusCfg.webpa_url, "localhost");
    assert_int_equal( (int) parodusCfg.webpa_backoff_max,0);
    assert_int_equal( (int) parodusCfg.boot_time,1234);
    assert_string_equal(  parodusCfg.local_url,"tcp://127.0.0.1:6666");
    assert_string_equal(  parodusCfg.partner_id,"cox");
-#ifdef ENABLE_SESHAT
    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);
-    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");
-#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_string_equal(parodusCfg.crud_config_file, "parodus_cfg.json");
+
 }

 void test_parseCommandLineNull()
 {
-    assert_int_equal (parseCommandLine(0,NULL,NULL), -1);
+    parseCommandLine(0,NULL,NULL);
 }

 void err_parseCommandLine()
 {
-	int argc;
-    char *command[] = {"parodus",
-		"--hw-model=TG1682",
-		"--hw-serial-number=Fer23u948590",
-		"-Z",
-		"--nosuch",
-		"--hw-mac=123567892366",
-		"webpa",
-		NULL
-	};
-    ParodusCfg parodusCfg;
+    int argc =K_argc;
+    char * command[20]={'\0'};

+    command[0] = "parodus";
+    command[1] = "--hw-model=TG1682";
+    command[12] = "webpa";
+
+    ParodusCfg parodusCfg;
    memset(&parodusCfg,0,sizeof(parodusCfg));

-	argc = (sizeof (command) / sizeof (char *)) - 1;
-	// Missing webpa_url
-    assert_int_equal (parseCommandLine(argc,command,&parodusCfg), -1);
-	// Bad webpa_url
-	command[5] = "--webpa-url=127.0.0.1";
-    assert_int_equal (parseCommandLine(argc,command,&parodusCfg), -1);
-	// Bad mac address
-	command[5] = "--hw-mac=1235678923";
-    assert_int_equal (parseCommandLine(argc,command,&parodusCfg), -1);
-	command[5] = "--webpa-ping-timeout=123x";
-    assert_int_equal (parseCommandLine(argc,command,&parodusCfg), -1);
-	command[5] = "--webpa-backoff-max=";
-    assert_int_equal (parseCommandLine(argc,command,&parodusCfg), -1);
-	command[5] = "--boot-time=12x";
-    assert_int_equal (parseCommandLine(argc,command,&parodusCfg), -1);
-#ifdef FEATURE_DNS_QUERY
-	command[5] = "--webpa-url=https://127.0.0.1";
-	command[3] = "--acquire-jwt=1";
-	command[4] = "--dns-txt-url=mydns.mycom.net";
-	// missing algo
-    assert_int_equal (parseCommandLine(argc,command,&parodusCfg), -1);
-	command[4] = "--jwt-algo=none:RS256";
-	// disallowed alogrithm none
-    assert_int_equal (parseCommandLine(argc,command,&parodusCfg), -1);
-	command[4] = "--jwt-algo=RS256";
-	// missing jwt public key file
-    assert_int_equal (parseCommandLine(argc,command,&parodusCfg), -1);
-	
-#endif    
+    parseCommandLine(argc,command,&parodusCfg);
+    assert_string_equal( parodusCfg.hw_model, "");
+    assert_string_equal( parodusCfg.hw_serial_number, "");
 }

 void test_loadParodusCfg()
 {
    ParodusCfg  tmpcfg;
-    ParodusCfg *Cfg = NULL;
+    ParodusCfg *Cfg;
    Cfg = (ParodusCfg*)malloc(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));
-    parStrncpy(Cfg->hw_manufacturer , "ARRISGroup,Inc.", sizeof(Cfg->hw_manufacturer));
-    parStrncpy(Cfg->hw_mac , "123567892366", sizeof(Cfg->hw_mac));
-    parStrncpy(Cfg->hw_last_reboot_reason , "unknown", sizeof(Cfg->hw_last_reboot_reason));
-    parStrncpy(Cfg->fw_name , "2.364s2", sizeof(Cfg->fw_name));
-    parStrncpy(Cfg->webpa_path_url , "/v1", sizeof(Cfg->webpa_path_url));
-    parStrncpy(Cfg->webpa_url , "http://127.0.0.1", sizeof(Cfg->webpa_url));
-    parStrncpy(Cfg->webpa_interface_used , "eth0", sizeof(Cfg->webpa_interface_used));
-    snprintf(protocol, sizeof(protocol), "%s-%s", PROTOCOL_VALUE, GIT_COMMIT_TAG);
-    parStrncpy(Cfg->webpa_protocol , protocol, sizeof(Cfg->webpa_protocol));
-    parStrncpy(Cfg->local_url , "tcp://10.0.0.1:6000", sizeof(Cfg->local_url));
-    parStrncpy(Cfg->partner_id , "shaw", sizeof(Cfg->partner_id));
-#ifdef FEATURE_DNS_QUERY
-	Cfg->acquire_jwt = 1;
-    parStrncpy(Cfg->dns_txt_url, "mydns",sizeof(Cfg->dns_txt_url));
-    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");
+    strcpy(Cfg->hw_model, "TG1682");
+    strcpy(Cfg->hw_serial_number, "Fer23u948590");
+    strcpy(Cfg->hw_manufacturer , "ARRISGroup,Inc.");
+    strcpy(Cfg->hw_mac , "123567892366");
+    strcpy(Cfg->hw_last_reboot_reason , "unknown");
+    strcpy(Cfg->fw_name , "2.364s2");
+    strcpy(Cfg->webpa_path_url , "/v1");
+    strcpy(Cfg->webpa_url , "localhost");
+    strcpy(Cfg->webpa_interface_used , "eth0");
+    strcpy(Cfg->webpa_protocol , "WebPA-1.6");
+    strcpy(Cfg->local_url , "tcp://10.0.0.1:6000");
+    strcpy(Cfg->partner_id , "shaw");
+
    memset(&tmpcfg,0,sizeof(ParodusCfg));
    loadParodusCfg(Cfg,&tmpcfg);

@@ -333,20 +190,6 @@ void test_loadParodusCfg()
    assert_string_equal( tmpcfg.hw_mac, "123567892366");
    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);
-#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(Cfg);
 }

@@ -363,11 +206,12 @@ void test_loadParodusCfgNull()
    assert_string_equal(temp.hw_model, "");
    assert_string_equal(temp.hw_serial_number, "");
    assert_string_equal(temp.hw_manufacturer, "");
-    assert_int_equal( (int) temp.flags,0);
+    assert_int_equal( (int) temp.secureFlag,1);	
    assert_string_equal( temp.webpa_path_url, WEBPA_PATH_URL);	
+    assert_string_equal( temp.webpa_protocol, WEBPA_PROTOCOL_VALUE);
    assert_string_equal( temp.webpa_uuid,"1234567-345456546");
    assert_string_equal( temp.local_url, PARODUS_UPSTREAM);
-	assert_null(temp.crud_config_file);
+
    free(cfg);
 }

@@ -377,223 +221,6 @@ void err_loadParodusCfg()
    loadParodusCfg(NULL,&cfg);
 }

-void test_parodusGitVersion()
-{
-   FILE *fp;
-   char version[32] = {'\0'};
-   char *command = "git describe --tags --always";
-   int n;
-   size_t len;
-   fp = popen(command,"r"); 
-   while(fgets(version, 32, fp) !=NULL)
-   {
-   	len = strlen(version);
-  	if (len > 0 && version[len-1] == '\n') 
-  	{
-    		version[--len] = '\0';
-  	}
-   }
-   pclose(fp);
-   
-   printf ("version: %s\n", version);
-   printf ("GIT_COMMIT_TAG: %s\n", GIT_COMMIT_TAG);
-   n = strcmp( version, GIT_COMMIT_TAG);
-   assert_int_equal(n, 0);
-}
-
-void test_setDefaultValuesToCfg()
-{
-    ParodusCfg *cfg = (ParodusCfg *) malloc(sizeof(ParodusCfg));
-    memset(cfg,0,sizeof(ParodusCfg));
-    setDefaultValuesToCfg(cfg);
-    assert_string_equal( cfg->local_url, PARODUS_UPSTREAM);
-#ifdef FEATURE_DNS_QUERY
-	assert_int_equal(cfg->acquire_jwt, 0);
-    assert_string_equal(cfg->dns_txt_url, DNS_TXT_URL);
-    assert_string_equal(cfg->jwt_key, "\0");
-    assert_int_equal( (int)cfg->jwt_algo, 0);
-#endif
-    assert_string_equal(cfg->cert_path, "\0");
-    assert_int_equal((int)cfg->flags, 0);
-    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);
-}
-
-void err_setDefaultValuesToCfg()
-{
-    setDefaultValuesToCfg(NULL);
-}
-
-void test_parse_num_arg ()
-{
-	assert_int_equal (parse_num_arg ("1234", "1234"), 1234);
-	assert_int_equal (parse_num_arg ("1", "1"), 1);
-	assert_int_equal (parse_num_arg ("0", "0"), 0);
-	assert_true (parse_num_arg ("", "empty arg") == (unsigned int) -1);
-	assert_true (parse_num_arg ("0x", "non-num arg") == (unsigned int) -1);
-	
-}
-
-void test_parse_mac_address ()
-{
-	char result[14];
-	assert_int_equal (parse_mac_address (result, "aabbccddeeff"), 0);
-	assert_string_equal (result, "aabbccddeeff");
-	assert_int_equal (parse_mac_address (result, "aa:bb:cc:dd:ee:ff"), 0);
-	assert_string_equal (result, "aabbccddeeff");
-	assert_int_equal (parse_mac_address (result, "aabbccddeeff0"), -1);
-	assert_int_equal (parse_mac_address (result, "aa:bb:c:dd:ee:ff:00"), -1);
-	assert_int_equal (parse_mac_address (result, ""), -1);
-}
-
-void test_server_is_http ()
-{
-	const char *server_ptr;
-	assert_int_equal (server_is_http ("https://127.0.0.1", &server_ptr), 0);
-	assert_string_equal (server_ptr, "127.0.0.1");
-	assert_int_equal (server_is_http ("http://127.0.0.1", &server_ptr), 1);
-	assert_string_equal (server_ptr, "127.0.0.1");
-	assert_int_equal (server_is_http ("127.0.0.1", &server_ptr), -1);
-	
-}
-
-void test_parse_webpa_url__ ()
-{
-	char addr_buf[80];
-	char port_buf[8];
-	assert_int_equal (parse_webpa_url__ ("mydns.mycom.net:8080",
-		addr_buf, 80, port_buf, 8), -1);
-	assert_int_equal (parse_webpa_url__ ("https://mydns.mycom.net:8080",
-		addr_buf, 80, port_buf, 8), 0);
-	assert_string_equal (addr_buf, "mydns.mycom.net");
-	assert_string_equal (port_buf, "8080");
-	assert_int_equal (parse_webpa_url__ ("https://mydns.mycom.net/",
-		addr_buf, 80, port_buf, 8), 0);
-	assert_string_equal (addr_buf, "mydns.mycom.net");
-	assert_string_equal (port_buf, "443");
-	assert_int_equal (parse_webpa_url__ ("https://mydns.mycom.net/api/v2/",
-		addr_buf, 80, port_buf, 8), 0);
-	assert_string_equal (addr_buf, "mydns.mycom.net");
-	assert_string_equal (port_buf, "443");
-	assert_int_equal (parse_webpa_url__ ("http://mydns.mycom.net:8080",
-		addr_buf, 80, port_buf, 8), 1);
-	assert_string_equal (addr_buf, "mydns.mycom.net");
-	assert_string_equal (port_buf, "8080");
-	assert_int_equal (parse_webpa_url__ ("http://mydns.mycom.net",
-		addr_buf, 80, port_buf, 8), 1);
-	assert_string_equal (addr_buf, "mydns.mycom.net");
-	assert_string_equal (port_buf, "80");
-    assert_int_equal (parse_webpa_url__ ("https://[2001:558:fc18:2:f816:3eff:fe7f:6efa]:8080",
-		addr_buf, 80, port_buf, 8), 0);
-	assert_string_equal (addr_buf, "2001:558:fc18:2:f816:3eff:fe7f:6efa");
-	assert_string_equal (port_buf, "8080");
-    assert_int_equal (parse_webpa_url__ ("https://[2001:558:fc18:2:f816:3eff:fe7f:6efa]",
-		addr_buf, 80, port_buf, 8), 0);
-	assert_string_equal (addr_buf, "2001:558:fc18:2:f816:3eff:fe7f:6efa");
-	assert_string_equal (port_buf, "443");
-    assert_int_equal (parse_webpa_url__ ("http://[2001:558:fc18:2:f816:3eff:fe7f:6efa]:8080",
-		addr_buf, 80, port_buf, 8), 1);
-	assert_string_equal (addr_buf, "2001:558:fc18:2:f816:3eff:fe7f:6efa");
-	assert_string_equal (port_buf, "8080");
-    assert_int_equal (parse_webpa_url__ ("http://[2001:558:fc18:2:f816:3eff:fe7f:6efa]",
-		addr_buf, 80, port_buf, 8), 1);
-	assert_string_equal (addr_buf, "2001:558:fc18:2:f816:3eff:fe7f:6efa");
-	assert_string_equal (port_buf, "80");
-    assert_int_equal (parse_webpa_url__ ("http://2001:558:fc18:2:f816:3eff:fe7f:6efa]",
-		addr_buf, 80, port_buf, 8), -1);
-    assert_int_equal (parse_webpa_url__ ("http://[2001:558:fc18:2:f816:3eff:fe7f:6efa",
-		addr_buf, 80, port_buf, 8), -1);
-    assert_int_equal (parse_webpa_url__ ("[2001:558:fc18:2:f816:3eff:fe7f:6efa",
-		addr_buf, 80, port_buf, 8), -1);
-	assert_int_equal (parse_webpa_url__ ("https://[2001:558:fc18:2:f816:3eff:fe7f:6efa]:8080/api/v2/",
-		addr_buf, 80, port_buf, 8), 0);
-	assert_string_equal (addr_buf, "2001:558:fc18:2:f816:3eff:fe7f:6efa");
-	assert_string_equal (port_buf, "8080");
-		
-}
-
-void test_parse_webpa_url ()
-{
-	char *addr;
-	unsigned int port;
-	assert_int_equal (parse_webpa_url ("mydns.mycom.net:8080",
-		&addr, &port), -1);
-	assert_int_equal (parse_webpa_url ("https://mydns.mycom.net:8080",
-		&addr, &port), 0);
-	assert_string_equal (addr, "mydns.mycom.net");
-	assert_int_equal (port, 8080);
-	free (addr);
-	assert_int_equal (parse_webpa_url ("https://mydns.mycom.net/",
-		&addr, &port), 0);
-	assert_string_equal (addr, "mydns.mycom.net");
-	assert_int_equal (port, 443);
-	free (addr);
-	assert_int_equal (parse_webpa_url ("http://mydns.mycom.net:8080",
-		&addr, &port), 1);
-	assert_string_equal (addr, "mydns.mycom.net");
-	assert_int_equal (port, 8080);
-	free (addr);
-	assert_int_equal (parse_webpa_url ("http://mydns.mycom.net",
-		&addr, &port), 1);
-	assert_string_equal (addr, "mydns.mycom.net");
-	assert_int_equal (port, 80);
-	free(addr);
-}
-
-void test_get_algo_mask ()
-{
-	assert_true (get_algo_mask ("RS256:RS512") == 5120);
-	assert_true (get_algo_mask ("none:RS256") == (unsigned int) -1);
-	assert_true (get_algo_mask ("nosuch") == (unsigned int) -1);
-#if ALLOW_NON_RSA_ALG
-	assert_true (get_algo_mask ("ES256:RS256") == 1026);
-#else
-	assert_true (get_algo_mask ("ES256:RS256") == (unsigned int) -1);
-#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                             */
 /*----------------------------------------------------------------------------*/
@@ -606,20 +233,9 @@ int main(void)
        cmocka_unit_test(test_loadParodusCfg),
        cmocka_unit_test(test_loadParodusCfgNull),
        cmocka_unit_test(err_loadParodusCfg),
-        cmocka_unit_test(test_parse_num_arg),
-        cmocka_unit_test(test_parse_mac_address),
-        cmocka_unit_test(test_get_algo_mask),
-        cmocka_unit_test(test_server_is_http),
-        cmocka_unit_test(test_parse_webpa_url__),
-        cmocka_unit_test(test_parse_webpa_url),
        cmocka_unit_test(test_parseCommandLine),
        cmocka_unit_test(test_parseCommandLineNull),
        cmocka_unit_test(err_parseCommandLine),
-        //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
@@ -27,22 +27,14 @@
 #include "../src/conn_interface.h"
 #include "../src/connection.h"
 #include "../src/config.h"
-#include "../src/heartBeat.h"
-#include "../src/close_retry.h"

 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
 UpStreamMsg *UpStreamMsgQ;
 ParodusMsg *ParodusMsgQ;
-pthread_mutex_t g_mutex=PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t g_cond=PTHREAD_COND_INITIALIZER;
-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;
-
- 
+extern bool close_retry;
+extern volatile unsigned int heartBeatTimer;
 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/
@@ -80,17 +72,6 @@ void packMetaData()
 }


-int get_cloud_disconnect_time(void)
-{
-    function_called();
-    return (int) (intptr_t)mock();
-}
-
-void set_cloud_disconnect_time(int Time)
-{
-    UNUSED(Time);
-    function_called();
-}

 void *handle_upstream()
 {
@@ -107,9 +88,9 @@ void *messageHandlerTask()
    return NULL;
 }

-int serviceAliveTask()
+void *serviceAliveTask()
 {
-    return 0;
+    return NULL;
 }

 int nopoll_loop_wait(noPollCtx * ctx,long timeout)
@@ -125,12 +106,6 @@ void set_global_reconnect_reason(char *reason)
    function_called();
 }

-void set_global_reconnect_status(bool status)
-{
-    (void)status;
-    function_called();
-}
-
 void close_and_unref_connection(noPollConn *conn)
 {
    UNUSED(conn);
@@ -160,18 +135,12 @@ void set_global_conn(noPollConn *conn)
    function_called();
 }

-void StartThread(void *(*start_routine) (void *), pthread_t *threadId)
+void StartThread(void *(*start_routine) (void *))
 {
    UNUSED(start_routine);
-    UNUSED(threadId);
    function_called(); 
 }

-void JoinThread (pthread_t threadId)
-{
-    UNUSED(threadId);
-}
-
 noPollCtx* nopoll_ctx_new(void)
 {
    function_called();
@@ -181,54 +150,6 @@ void initKeypress()
 {
    function_called();
 }
-
-UpStreamMsg * get_global_UpStreamMsgQ(void)
-{
-    return UpStreamMsgQ;
-}
-
-void set_global_UpStreamMsgQ(UpStreamMsg * UpStreamQ)
-{
-    UpStreamMsgQ = UpStreamQ;
-}
-
-pthread_cond_t *get_global_nano_con(void)
-{
-    return &nano_con;
-}
-
-pthread_mutex_t *get_global_nano_mut(void)
-{
-    return &nano_mut;
-}
-
-pthread_cond_t *get_global_svc_con(void)
-{
-    return &svc_con;
-}
-
-pthread_mutex_t *get_global_svc_mut(void)
-{
-    return &svc_mut;
-}
-
-/*
-* Mock func to calculate time diff between start and stop time
-* This timespec_diff retuns 1 sec as diff time
-*/
-void timespec_diff(struct timespec *start, struct timespec *stop,
-                   struct timespec *diff)
-{
-   UNUSED(start);
-   UNUSED(stop);
-   diff->tv_sec = 1;
-   diff->tv_nsec = 1000;
-}
-
-void deleteAllClients (void)
-{
-}
-
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/
@@ -238,7 +159,8 @@ void test_createSocketConnection()
    noPollCtx *ctx;
    ParodusCfg cfg;
    memset(&cfg,0,sizeof(ParodusCfg));
-    reset_close_retry();
+    
+    close_retry = false;
    expect_function_call(nopoll_thread_handlers);
    
    will_return(nopoll_ctx_new, (intptr_t)&ctx);
@@ -248,14 +170,13 @@ void test_createSocketConnection()
    expect_function_call(createNopollConnection);
    expect_function_call(packMetaData);

-    expect_function_calls(StartThread, 5);
+    expect_function_calls(StartThread, 4);
    expect_function_call(initKeypress);
    will_return(nopoll_loop_wait, 1);
    expect_function_call(nopoll_loop_wait);
    
    expect_function_call(set_global_reconnect_reason);
    will_return(get_global_conn, (intptr_t)NULL);
-    expect_function_call(set_global_reconnect_status);
    expect_function_call(get_global_conn);
    expect_function_call(close_and_unref_connection);
    expect_function_call(set_global_conn);
@@ -266,7 +187,7 @@ void test_createSocketConnection()
    expect_function_call(close_and_unref_connection);
    expect_function_call(nopoll_ctx_unref);
    expect_function_call(nopoll_cleanup_library);
-    createSocketConnection(initKeypress);
+    createSocketConnection(&cfg,initKeypress);
 }

 void test_createSocketConnection1()
@@ -274,7 +195,7 @@ void test_createSocketConnection1()
    noPollCtx *ctx;
    ParodusCfg cfg;
    memset(&cfg,0, sizeof(ParodusCfg));
-    set_close_retry();
+    close_retry = true;
    expect_function_call(nopoll_thread_handlers);
    
    will_return(nopoll_ctx_new, (intptr_t)&ctx);
@@ -284,7 +205,7 @@ void test_createSocketConnection1()
    expect_function_call(createNopollConnection);
    expect_function_call(packMetaData);

-    expect_function_calls(StartThread, 5);
+    expect_function_calls(StartThread, 4);
    will_return(nopoll_loop_wait, 1);
    expect_function_call(nopoll_loop_wait);
    
@@ -299,32 +220,29 @@ void test_createSocketConnection1()
    expect_function_call(close_and_unref_connection);
    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);
+    createSocketConnection(&cfg,NULL);
    
 }

-void test_PingMissIntervalTime()
+void test_createSocketConnection2()
 {
    noPollCtx *ctx;
    ParodusCfg cfg;
    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));
-    parStrncpy(cfg.hw_manufacturer , "ARRISGroup,Inc.", sizeof(cfg.hw_manufacturer));
-    parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
-    parStrncpy(cfg.hw_last_reboot_reason , "unknown", sizeof(cfg.hw_last_reboot_reason));
-    parStrncpy(cfg.fw_name , "2.364s2", sizeof(cfg.fw_name));
-    parStrncpy(cfg.webpa_path_url , "/v1", sizeof(cfg.webpa_path_url));
-    parStrncpy(cfg.webpa_url , "localhost", sizeof(cfg.webpa_url));
-    parStrncpy(cfg.webpa_interface_used , "eth0", sizeof(cfg.webpa_interface_used));
-    parStrncpy(cfg.webpa_protocol , "WebPA-1.6", sizeof(cfg.webpa_protocol));
-    parStrncpy(cfg.webpa_uuid , "1234567-345456546", sizeof(cfg.webpa_uuid));
-    //Max ping timeout is 6 sec
-    cfg.webpa_ping_timeout = 6;
-    set_parodus_cfg(&cfg);
+    strcpy(cfg.hw_model, "TG1682");
+    strcpy(cfg.hw_serial_number, "Fer23u948590");
+    strcpy(cfg.hw_manufacturer , "ARRISGroup,Inc.");
+    strcpy(cfg.hw_mac , "123567892366");
+    strcpy(cfg.hw_last_reboot_reason , "unknown");
+    strcpy(cfg.fw_name , "2.364s2");
+    strcpy(cfg.webpa_path_url , "/v1");
+    strcpy(cfg.webpa_url , "localhost");
+    strcpy(cfg.webpa_interface_used , "eth0");
+    strcpy(cfg.webpa_protocol , "WebPA-1.6");
+    strcpy(cfg.webpa_uuid , "1234567-345456546");
+    cfg.webpa_ping_timeout = 1;
    
-    reset_close_retry();
+    close_retry = false;
    expect_function_call(nopoll_thread_handlers);
    
    will_return(nopoll_ctx_new, (intptr_t)&ctx);
@@ -334,8 +252,7 @@ void test_PingMissIntervalTime()
    expect_function_call(createNopollConnection);
    expect_function_call(packMetaData);

-    expect_function_calls(StartThread, 5);
-    //Increment ping interval time to 1 sec for each nopoll_loop_wait call
+    expect_function_calls(StartThread, 4);
    will_return(nopoll_loop_wait, 1);
    will_return(nopoll_loop_wait, 1);
    will_return(nopoll_loop_wait, 1);
@@ -344,10 +261,9 @@ void test_PingMissIntervalTime()
    will_return(nopoll_loop_wait, 1);
    will_return(nopoll_loop_wait, 1);
    expect_function_calls(nopoll_loop_wait, 7);
-    //Expecting Ping miss after 6 sec
+    
    expect_function_call(set_global_reconnect_reason);
    will_return(get_global_conn, (intptr_t)NULL);
-    expect_function_call(set_global_reconnect_status);
    expect_function_call(get_global_conn);
    expect_function_call(close_and_unref_connection);
    expect_function_call(set_global_conn);
@@ -358,14 +274,13 @@ void test_PingMissIntervalTime()
    expect_function_call(close_and_unref_connection);
    expect_function_call(nopoll_ctx_unref);
    expect_function_call(nopoll_cleanup_library);
-    createSocketConnection(NULL);
-    
+    createSocketConnection(&cfg,NULL);
 }

 void err_createSocketConnection()
 {
-    set_close_retry();
-    reset_heartBeatTimer();
+    close_retry = true;
+    heartBeatTimer = 0;
    expect_function_call(nopoll_thread_handlers);
    
    will_return(nopoll_ctx_new, (intptr_t)NULL);
@@ -375,7 +290,7 @@ void err_createSocketConnection()
    expect_function_call(createNopollConnection);
    expect_function_call(packMetaData);

-    expect_function_calls(StartThread, 5);
+    expect_function_calls(StartThread, 4);
    will_return(nopoll_loop_wait, 1);
    expect_function_call(nopoll_loop_wait);
    
@@ -390,54 +305,7 @@ void err_createSocketConnection()
    expect_function_call(close_and_unref_connection);
    expect_function_call(nopoll_ctx_unref);
    expect_function_call(nopoll_cleanup_library);
-    createSocketConnection(NULL);
-}
-
-
-void test_createSocketConnection_cloud_disconn()
-{
-	ParodusCfg cfg;
-	memset(&cfg,0,sizeof(ParodusCfg));
-	cfg.cloud_disconnect = strdup("XPC");
-	set_parodus_cfg(&cfg);
-
-	set_close_retry();
-	reset_heartBeatTimer();
-	expect_function_call(nopoll_thread_handlers);
-
-	will_return(nopoll_ctx_new, (intptr_t)NULL);
-	expect_function_call(nopoll_ctx_new);
-	expect_function_call(nopoll_log_set_handler);
-	will_return(createNopollConnection, nopoll_true);
-	expect_function_call(createNopollConnection);
-	expect_function_call(packMetaData);
-
-	expect_function_calls(StartThread, 5);
-	will_return(nopoll_loop_wait, 1);
-	expect_function_call(nopoll_loop_wait);
-
-	will_return(get_global_conn, (intptr_t)NULL);
-	expect_function_call(get_global_conn);
-	expect_function_call(close_and_unref_connection);
-	expect_function_call(set_global_conn);
-
-
-	expect_function_call(set_cloud_disconnect_time);
-	will_return(get_cloud_disconnect_time, 0);
-	expect_function_call(get_cloud_disconnect_time);
-	will_return(get_cloud_disconnect_time, 0);
-	expect_function_call(get_cloud_disconnect_time);
-	will_return(get_cloud_disconnect_time, 0);
-	expect_function_call(get_cloud_disconnect_time);
-
-	will_return(createNopollConnection, nopoll_true);
-	expect_function_call(createNopollConnection);
-	will_return(get_global_conn, (intptr_t)NULL);
-	expect_function_call(get_global_conn);
-	expect_function_call(close_and_unref_connection);
-	expect_function_call(nopoll_ctx_unref);
-	expect_function_call(nopoll_cleanup_library);
-	createSocketConnection(NULL);
+    createSocketConnection(NULL,NULL);
 }

 /*----------------------------------------------------------------------------*/
@@ -449,9 +317,8 @@ int main(void)
    const struct CMUnitTest tests[] = {
        cmocka_unit_test(test_createSocketConnection),
        cmocka_unit_test(test_createSocketConnection1),
-        cmocka_unit_test(test_PingMissIntervalTime),
+        cmocka_unit_test(test_createSocketConnection2),
        cmocka_unit_test(err_createSocketConnection),
-        cmocka_unit_test(test_createSocketConnection_cloud_disconn)
    };

    return cmocka_run_group_tests(tests, NULL, NULL);
--- a/tests/test_connection.c
+++ b/tests/test_connection.c
--- a/tests/test_createConnection.c
+++ b/tests/test_createConnection.c
--- a/tests/test_crud_interface.c
+++ b/tests/test_crud_interface.c
@@ -1,397 +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 <string.h> 
-#include <unistd.h> 
-
-#include <wrp-c.h>
-#include "../src/crud_interface.h"
-#include "../src/config.h"
-#include "../src/client_list.h"
-#include "../src/ParodusInternal.h"
-#include "../src/partners_check.h"
-
-
-/*----------------------------------------------------------------------------*/
-/*                            File Scoped Variables                           */
-/*----------------------------------------------------------------------------*/
-bool g_shutdown  = false;
-extern CrudMsg *crudMsgQ;
-int numLoops = 1;
-wrp_msg_t *temp = NULL;
-
-/*----------------------------------------------------------------------------*/
-/*                                   Mocks                                    */
-/*----------------------------------------------------------------------------*/
-
-char * get_global_UpStreamMsgQ(void)
-{
-    function_called();
-    return (char *)mock();
-}
-
-int set_global_UpStreamMsgQ(void)
-{
-    function_called();
-    return (int)mock();
-}
-
-int get_global_nano_con(void)
-{
-    function_called();
-    return (int)mock();
-}
-
-int get_global_nano_mut(void)
-{
-    function_called();
-    return (int)mock();
-}
-
-char *get_global_reconnect_reason()
-{
-    function_called();
-    return (char *)(intptr_t)mock();
-}	
-
-ParodusCfg *get_parodus_cfg(void)
-{
-    function_called();
-    return (ParodusCfg*) (intptr_t)mock();
-}
-
-int pthread_mutex_lock(pthread_mutex_t *restrict mutex)
-{
-    UNUSED(mutex);
-    function_called();
-    return (int)mock();
-}
-
-int pthread_mutex_unlock(pthread_mutex_t *restrict mutex)
-{
-    UNUSED(mutex);
-    function_called();
-    return (int)mock();
-}
-
-int pthread_cond_signal(pthread_cond_t *restrict cond)
-{
-    UNUSED(cond); 
-    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();
-}
-
-
-int processCrudRequest(wrp_msg_t *reqMsg, wrp_msg_t **responseMsg )
-{
-	UNUSED(reqMsg);
-	wrp_msg_t *resp_msg = NULL;
-    resp_msg = ( wrp_msg_t *)malloc( sizeof( wrp_msg_t ) );  
-    memset(resp_msg, 0, sizeof(wrp_msg_t));
-    
-    resp_msg->msg_type = 5;
-    resp_msg->u.crud.transaction_uuid = strdup("1234");
-    resp_msg->u.crud.source = strdup("tag-update");
-    resp_msg->u.crud.dest = strdup("mac:14xxx/parodus/tags");
-    *responseMsg = resp_msg;
-	function_called();
-	return (int)mock();
-}
-
-/*----------------------------------------------------------------------------*/
-/*                                   Tests                                    */
-/*----------------------------------------------------------------------------*/
-
-void test_addCRUDmsgToQueue()
-{
-
-	wrp_msg_t *crud_msg = NULL;
-	crud_msg = ( wrp_msg_t *)malloc( sizeof( wrp_msg_t ) );  
-	memset(crud_msg, 0, sizeof(wrp_msg_t));
-
-	crud_msg->msg_type = 5;
-	crud_msg->u.crud.transaction_uuid = strdup("bd4ad2d1-5c9c-486f-8e25-52c242b38f71");
-    crud_msg->u.crud.source = strdup("tag-update");
-    crud_msg->u.crud.dest = strdup("mac:14xxx/parodus/tags");
-	
-    will_return(pthread_mutex_lock, 0);
-    expect_function_call(pthread_mutex_lock);
-    
-    will_return(pthread_mutex_unlock, 0);
-    expect_function_call(pthread_mutex_unlock);
-    
-    crudMsgQ = (CrudMsg *)malloc(sizeof(CrudMsg));
-	crudMsgQ->msg = crud_msg;
-	
-	crudMsgQ->next = (CrudMsg *) malloc(sizeof(CrudMsg));
-    crudMsgQ->next->msg = crud_msg;
-    crudMsgQ->next->next = NULL;
-    
-	addCRUDmsgToQueue(crud_msg);
-	
-	free(crudMsgQ->next);
-    free(crudMsgQ);
-    crudMsgQ = NULL;
-    
-    wrp_free_struct(crud_msg);
-	
-}
-
-
-void test_addCRUDmsgToQueueNULL()
-{
-	wrp_msg_t *crud_msg = NULL;
-	crud_msg = ( wrp_msg_t *)malloc( sizeof( wrp_msg_t ) );  
-	memset(crud_msg, 0, sizeof(wrp_msg_t));
-
-	crud_msg->msg_type = 5;
-	crud_msg->u.crud.transaction_uuid = strdup("bd4ad2d1-5c9c-486f-8e25-52c242b38f71");
-    crud_msg->u.crud.source = strdup("tag-update");
-    crud_msg->u.crud.dest = strdup("mac:14xxx/parodus/tags");
-	
-    will_return(pthread_mutex_lock, 0);
-    expect_function_call(pthread_mutex_lock);
-    
-    will_return(pthread_cond_signal, 0);
-    expect_function_call(pthread_cond_signal);
-    
-    will_return(pthread_mutex_unlock, 0);
-    expect_function_call(pthread_mutex_unlock);
-    
-	addCRUDmsgToQueue(crud_msg);
-	
-	free(crudMsgQ->next);
-    free(crudMsgQ);
-    crudMsgQ = NULL;
-    wrp_free_struct(crud_msg);
-	
-}
-
-void err_CRUDHandlerTask()
-{
-    numLoops = 1;
-    crudMsgQ = NULL;
-    
-    will_return(pthread_mutex_lock, 0);
-    expect_function_call(pthread_mutex_lock);
-    
-    will_return(pthread_cond_wait, 0);
-    expect_function_call(pthread_cond_wait);
-    
-    will_return(pthread_mutex_unlock, 0);
-    expect_function_call(pthread_mutex_unlock);
-    
-    CRUDHandlerTask();
-}
-
-
-void test_CRUDHandlerTask()
-{
-	numLoops = 1;
-	wrp_msg_t *crud_msg = NULL;
-	crud_msg = ( wrp_msg_t *)malloc( sizeof( wrp_msg_t ) );  
-	memset(crud_msg, 0, sizeof(wrp_msg_t));
-
-	crud_msg->msg_type = 5;
-	crud_msg->u.crud.transaction_uuid = strdup("bd4ad2d1-5c9c-486f-8e25-52c242b38f71");
-    crud_msg->u.crud.source = strdup("tag-update");
-    crud_msg->u.crud.dest = strdup("mac:14xxx/parodus/tags");
-    
-    crudMsgQ = (CrudMsg *)malloc(sizeof(CrudMsg));
-	crudMsgQ->msg = crud_msg;
-	crudMsgQ->next = NULL;
-	
-	will_return(pthread_mutex_lock, 0);
-    expect_function_call(pthread_mutex_lock);
-    
-    will_return(pthread_mutex_unlock, 0);
-    expect_function_call(pthread_mutex_unlock);
-    
-    will_return(processCrudRequest, 0);
-    expect_function_call(processCrudRequest);
-    
-    will_return(get_global_nano_mut, 0);
-    expect_function_call(get_global_nano_mut);
-    
-    will_return(pthread_mutex_lock, 0);
-    expect_function_call(pthread_mutex_lock);
-    
-    will_return(get_global_UpStreamMsgQ, NULL);
-    expect_function_call(get_global_UpStreamMsgQ);
-    
-    will_return(set_global_UpStreamMsgQ, 0);
-    expect_function_call(set_global_UpStreamMsgQ);
-    
-    will_return(get_global_nano_con, 0);
-    expect_function_call(get_global_nano_con);
-    
-    will_return(pthread_cond_signal, 0);
-    expect_function_call(pthread_cond_signal);
-    
-    will_return(get_global_nano_mut, 0);
-    expect_function_call(get_global_nano_mut);
-    
-    will_return(pthread_mutex_unlock, 0);
-    expect_function_call(pthread_mutex_unlock);
-    
-	CRUDHandlerTask();
-	
-    free(crudMsgQ);
-	
-}
-
-void test_CRUDHandlerTaskFailure()
-{
-	numLoops = 1;
-	wrp_msg_t *crud_msg = NULL;
-	
-	crud_msg = ( wrp_msg_t *)malloc( sizeof( wrp_msg_t ) );  
-	memset(crud_msg, 0, sizeof(wrp_msg_t));
-
-	crud_msg->msg_type = 5;
-	crud_msg->u.crud.transaction_uuid = strdup("bd4ad2d1-5c9c-486f-8e25-52c242b38f71");
-    crud_msg->u.crud.source = strdup("tag-update");
-    crud_msg->u.crud.dest = strdup("mac:14xxx/parodus/tags");
-    
-    crudMsgQ = (CrudMsg *)malloc(sizeof(CrudMsg));
-	crudMsgQ->msg = crud_msg;
-	crudMsgQ->next = NULL;
-	
-	will_return(pthread_mutex_lock, 0);
-    expect_function_call(pthread_mutex_lock);
-    
-    will_return(pthread_mutex_unlock, 0);
-    expect_function_call(pthread_mutex_unlock);
-    
-    will_return(processCrudRequest, -1);
-    expect_function_call(processCrudRequest);
-    
-    
-    will_return(get_global_nano_mut, 0);
-    expect_function_call(get_global_nano_mut);
-	
-	will_return(pthread_mutex_lock, 0);
-    expect_function_call(pthread_mutex_lock);
-    
-    will_return(get_global_UpStreamMsgQ, 0);
-    expect_function_call(get_global_UpStreamMsgQ);
-    
-    will_return(set_global_UpStreamMsgQ, 0);
-    expect_function_call(set_global_UpStreamMsgQ);
-    
-    will_return(get_global_nano_con, 0);
-    expect_function_call(get_global_nano_con);
-    
-    will_return(pthread_cond_signal, 0);
-    expect_function_call(pthread_cond_signal);
-    
-    will_return(get_global_nano_mut, 0);
-    expect_function_call(get_global_nano_mut);
-    
-    will_return(pthread_mutex_unlock, 0);
-    expect_function_call(pthread_mutex_unlock);
-    
-    
-	CRUDHandlerTask();
-	
-	free(crudMsgQ);
-	
-}
-
-void test_addCRUDresponseToUpstreamQ()
-{
-	numLoops = 1;
-	ssize_t resp_size = 0;
-	void *resp_bytes;
-	
-	wrp_msg_t *resp_msg = NULL;
-    resp_msg = ( wrp_msg_t *)malloc( sizeof( wrp_msg_t ) );  
-    memset(resp_msg, 0, sizeof(wrp_msg_t));
-    
-    resp_msg->msg_type = 5;
-    resp_msg->u.crud.transaction_uuid = strdup("1234");
-    resp_msg->u.crud.source = strdup("tag-update");
-    resp_msg->u.crud.dest = strdup("mac:14xxx/parodus/tags");
-    
-    resp_size = wrp_struct_to( resp_msg, WRP_BYTES, &resp_bytes );
-	
-	will_return(get_global_nano_mut, 0);
-    expect_function_call(get_global_nano_mut);
-	
-	will_return(pthread_mutex_lock, 0);
-    expect_function_call(pthread_mutex_lock);
-    
-    will_return(get_global_UpStreamMsgQ, 0);
-    expect_function_call(get_global_UpStreamMsgQ);
-    
-    will_return(set_global_UpStreamMsgQ, 0);
-    expect_function_call(set_global_UpStreamMsgQ);
-    
-    will_return(get_global_nano_con, 0);
-    expect_function_call(get_global_nano_con);
-    
-    will_return(pthread_cond_signal, 0);
-    expect_function_call(pthread_cond_signal);
-    
-    will_return(get_global_nano_mut, 0);
-    expect_function_call(get_global_nano_mut);
-    
-    will_return(pthread_mutex_unlock, 0);
-    expect_function_call(pthread_mutex_unlock);
-    
-	addCRUDresponseToUpstreamQ(resp_bytes, resp_size);
-	
-    wrp_free_struct(resp_msg);
-	
-}
-
-
-void test_addCRUDmsgToQueueAllocation()
-{
-	addCRUDmsgToQueue(NULL);
-}
-/*----------------------------------------------------------------------------*/
-/*                             External Functions                             */
-/*----------------------------------------------------------------------------*/
-
-int main(void)
-{
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test(test_addCRUDmsgToQueueNULL),
-        cmocka_unit_test(test_addCRUDmsgToQueue),
-        cmocka_unit_test(test_addCRUDmsgToQueueAllocation),
-        cmocka_unit_test(err_CRUDHandlerTask),
-        cmocka_unit_test(test_CRUDHandlerTask),
-        cmocka_unit_test(test_CRUDHandlerTaskFailure),
-        cmocka_unit_test(test_addCRUDresponseToUpstreamQ)
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
--- a/tests/test_crud_internal.c
+++ b/tests/test_crud_internal.c
--- a/tests/test_crud_tasks.c
+++ b/tests/test_crud_tasks.c
@@ -1,283 +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 <string.h> 
-#include <unistd.h> 
-
-#include <wrp-c.h>
-#include "../src/crud_tasks.h"
-#include "../src/config.h"
-#include "../src/client_list.h"
-#include "../src/ParodusInternal.h"
-#include "../src/partners_check.h"
-
-/*----------------------------------------------------------------------------*/
-/*                            File Scoped Variables                           */
-/*----------------------------------------------------------------------------*/
-wrp_msg_t *response = NULL;
-/*----------------------------------------------------------------------------*/
-/*                                   Mocks                                    */
-/*----------------------------------------------------------------------------*/
-
-cJSON * cJSON_Parse(const char *payload)
-{
-	UNUSED(payload);
-    function_called();
-    return (cJSON *) mock();
-}
-
-int createObject(wrp_msg_t *reqMsg , wrp_msg_t **response)
-{
-    UNUSED(reqMsg); UNUSED(response); 
-    function_called();
-    return (int) mock();
-}
-
-int retrieveObject(wrp_msg_t *reqMsg , wrp_msg_t **response)
-{
-    UNUSED(reqMsg); UNUSED(response);
-    function_called();
-    return (int) mock();
-}
-
-int updateObject(wrp_msg_t *reqMsg , wrp_msg_t **response)
-{
-    UNUSED(reqMsg); UNUSED(response);
-    function_called();
-    return (int) mock();
-}
-
-int deleteObject(wrp_msg_t *reqMsg , wrp_msg_t **response)
-{
-    UNUSED(reqMsg); UNUSED(response);
-    function_called();
-    return (int) mock();
-}
-
-/*----------------------------------------------------------------------------*/
-/*                                   Tests                                    */
-/*----------------------------------------------------------------------------*/
-
-void test_processCrudRequestCreate()
-{
-	int ret = -1;
-	wrp_msg_t *reqMsg = NULL;
-    reqMsg = ( wrp_msg_t *)malloc( sizeof( wrp_msg_t ) );  
-    memset(reqMsg, 0, sizeof(wrp_msg_t));
-    
-    reqMsg->msg_type = 5;
-    reqMsg->u.crud.transaction_uuid = strdup("1234");
-    reqMsg->u.crud.source = strdup("tag-update");
-    reqMsg->u.crud.dest = strdup("mac:14xxx/parodus/tags");
-    will_return(createObject, 0);
-    expect_function_call(createObject);
-    
-    ret = processCrudRequest(reqMsg, &response);
-    assert_int_equal(ret, 0);
-
-	wrp_free_struct(reqMsg);
-
-}
-
-void test_processCrudRequestCreateFailure()
-{
-	int ret = -2;
-	wrp_msg_t *reqMsg = NULL;
-    reqMsg = ( wrp_msg_t *)malloc( sizeof( wrp_msg_t ) );  
-    memset(reqMsg, 0, sizeof(wrp_msg_t));
-    
-    reqMsg->msg_type = 5;
-    reqMsg->u.crud.transaction_uuid = strdup("1234");
-    reqMsg->u.crud.source = strdup("tag-update");
-    reqMsg->u.crud.dest = strdup("mac:14xxx/parodus/tags");
-    will_return(createObject, -1);
-    expect_function_call(createObject);
-    ret = processCrudRequest(reqMsg, &response);
-    assert_int_equal(ret, -1);
-
-	wrp_free_struct(reqMsg);
-
-}
-
-void test_processCrudRequestRetrieve()
-{
-	int ret = -2;
-	wrp_msg_t *reqMsg = NULL;
-    reqMsg = ( wrp_msg_t *)malloc( sizeof( wrp_msg_t ) );  
-    memset(reqMsg, 0, sizeof(wrp_msg_t));
-    
-    reqMsg->msg_type = 6;
-    reqMsg->u.crud.transaction_uuid = strdup("1234");
-    reqMsg->u.crud.source = strdup("tag-update");
-    reqMsg->u.crud.dest = strdup("mac:14xxx/parodus/tags");
-    will_return(retrieveObject, 0);
-    expect_function_call(retrieveObject);
-    ret = processCrudRequest(reqMsg, &response);
-    assert_int_equal(ret, 0);
-
-	wrp_free_struct(reqMsg);
-
-}
-
-void test_processCrudRequestRetrieveFailure()
-{
-	int ret = -2;
-	wrp_msg_t *reqMsg = NULL;
-    reqMsg = ( wrp_msg_t *)malloc( sizeof( wrp_msg_t ) );  
-    memset(reqMsg, 0, sizeof(wrp_msg_t));
-    
-    reqMsg->msg_type = 6;
-    reqMsg->u.crud.transaction_uuid = strdup("1234");
-    reqMsg->u.crud.source = strdup("tag-update");
-    reqMsg->u.crud.dest = strdup("mac:14xxx/parodus/tags");
-    will_return(retrieveObject, -1);
-    expect_function_call(retrieveObject);
-    
-    ret = processCrudRequest(reqMsg, &response);
-    assert_int_equal(ret, -1);
-
-	wrp_free_struct(reqMsg);
-
-}
-
-void test_processCrudRequestUpdate()
-{
-	int ret = -2;
-	wrp_msg_t *reqMsg = NULL;
-    reqMsg = ( wrp_msg_t *)malloc( sizeof( wrp_msg_t ) );  
-    memset(reqMsg, 0, sizeof(wrp_msg_t));
-    
-    reqMsg->msg_type = 7;
-    reqMsg->u.crud.transaction_uuid = strdup("1234");
-    reqMsg->u.crud.source = strdup("tag-update");
-    reqMsg->u.crud.dest = strdup("mac:14xxx/parodus/tags");
-    will_return(updateObject, 0);
-    expect_function_call(updateObject);
-    ret = processCrudRequest(reqMsg, &response);
-    assert_int_equal(ret, 0);
-
-	wrp_free_struct(reqMsg);
-
-}
-
-void test_processCrudRequestUpdateFailure()
-{
-	int ret = -2;
-	wrp_msg_t *reqMsg = NULL;
-    reqMsg = ( wrp_msg_t *)malloc( sizeof( wrp_msg_t ) );  
-    memset(reqMsg, 0, sizeof(wrp_msg_t));
-    
-    reqMsg->msg_type = 7;
-    reqMsg->u.crud.transaction_uuid = strdup("1234");
-    reqMsg->u.crud.source = strdup("tag-update");
-    reqMsg->u.crud.dest = strdup("mac:14xxx/parodus/tags");
-    will_return(updateObject, -1);
-    expect_function_call(updateObject);
-    
-    ret = processCrudRequest(reqMsg, &response);
-    assert_int_equal(ret, -1);
-
-	wrp_free_struct(reqMsg);
-
-}
-
-void test_processCrudRequestDelete()
-{
-	int ret = -2;
-	wrp_msg_t *reqMsg = NULL;
-    reqMsg = ( wrp_msg_t *)malloc( sizeof( wrp_msg_t ) );  
-    memset(reqMsg, 0, sizeof(wrp_msg_t));
-    
-    reqMsg->msg_type = 8;
-    reqMsg->u.crud.transaction_uuid = strdup("1234");
-    reqMsg->u.crud.source = strdup("tag-update");
-    reqMsg->u.crud.dest = strdup("mac:14xxx/parodus/tags");
-    will_return(deleteObject, 0);
-    expect_function_call(deleteObject);
-    ret = processCrudRequest(reqMsg, &response);
-    assert_int_equal(ret, 0);
-
-	wrp_free_struct(reqMsg);
-
-}
-
-void test_processCrudRequestDeleteFailure()
-{
-	int ret = -2;
-	wrp_msg_t *reqMsg = NULL;
-    reqMsg = ( wrp_msg_t *)malloc( sizeof( wrp_msg_t ) );  
-    memset(reqMsg, 0, sizeof(wrp_msg_t));
-    
-    reqMsg->msg_type = 8;
-    reqMsg->u.crud.transaction_uuid = strdup("1234");
-    reqMsg->u.crud.source = strdup("tag-update");
-    reqMsg->u.crud.dest = strdup("mac:14xxx/parodus/tags");
-    will_return(deleteObject, -1);
-    expect_function_call(deleteObject);
-    
-    ret = processCrudRequest(reqMsg, &response);
-    assert_int_equal(ret, -1);
-
-	wrp_free_struct(reqMsg);
-
-}
-
-void test_processCrudRequestFailure()
-{
-	int ret = -2;
-	wrp_msg_t *reqMsg = NULL;
-    reqMsg = ( wrp_msg_t *)malloc( sizeof( wrp_msg_t ) );  
-    memset(reqMsg, 0, sizeof(wrp_msg_t));
-    
-    reqMsg->msg_type = 3;
-    reqMsg->u.crud.transaction_uuid = strdup("1234");
-    reqMsg->u.crud.source = strdup("tag-update");
-    reqMsg->u.crud.dest = strdup("mac:14xxx/parodus/tags");
-    
-    ret = processCrudRequest(reqMsg, &response);
-    assert_int_equal(ret, 0);
-
-	wrp_free_struct(reqMsg);
-
-}
-
-/*----------------------------------------------------------------------------*/
-/*                             External Functions                             */
-/*----------------------------------------------------------------------------*/
-
-int main(void)
-{
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test(test_processCrudRequestCreate),
-        cmocka_unit_test(test_processCrudRequestCreateFailure),
-        cmocka_unit_test(test_processCrudRequestRetrieve),
-        cmocka_unit_test(test_processCrudRequestRetrieveFailure),
-        cmocka_unit_test(test_processCrudRequestUpdate),
-        cmocka_unit_test(test_processCrudRequestUpdateFailure),
-        cmocka_unit_test(test_processCrudRequestDelete),
-        cmocka_unit_test(test_processCrudRequestDeleteFailure),
-        cmocka_unit_test(test_processCrudRequestFailure),
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
--- a/tests/test_downstream.c
+++ b/tests/test_downstream.c
@@ -21,7 +21,6 @@
 #include <stddef.h>
 #include <setjmp.h>
 #include <cmocka.h>
-#include <wrp-c.h>

 #include "../src/downstream.h"
 #include "../src/ParodusInternal.h"
@@ -33,16 +32,9 @@
 ParodusMsg *ParodusMsgQ;
 pthread_mutex_t g_mutex;
 pthread_cond_t g_cond;
-int crud_test = 0;
 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/
-void addCRUDmsgToQueue(wrp_msg_t *crudMsg)
-{
-	UNUSED(crudMsg) ;
-	function_called();
-}
-
 void sendUpstreamMsgToServer(void **resp_bytes, size_t resp_size)
 {
    UNUSED(resp_bytes); UNUSED(resp_size);
@@ -61,10 +53,6 @@ reg_list_item_t * get_global_node(void)
    return mock_ptr_type(reg_list_item_t *);
 }

-void release_global_node (void)
-{
-}
-
 ssize_t wrp_to_struct( const void *bytes, const size_t length,
                       const enum wrp_format fmt, wrp_msg_t **msg )
 {
@@ -72,22 +60,13 @@ ssize_t wrp_to_struct( const void *bytes, const size_t length,
    function_called();
    *msg = (wrp_msg_t*) malloc(sizeof(wrp_msg_t));
    memset(*msg, 0, sizeof(wrp_msg_t));
-	(*msg)->msg_type = WRP_MSG_TYPE__REQ;   
-	(*msg)->u.req.dest = (char *) malloc(sizeof(char) *100);
-	(*msg)->u.req.partner_ids = (partners_t *) malloc(sizeof(partners_t));
-	(*msg)->u.req.partner_ids->count = 1;
-	(*msg)->u.req.partner_ids->partner_ids[0] = (char *) malloc(sizeof(char) *64);
-	parStrncpy((*msg)->u.req.dest,"mac:1122334455/iot", 100);
-	parStrncpy((*msg)->u.req.partner_ids->partner_ids[0],"comcast", 64);
-	if(crud_test)
-	{
-			(*msg)->msg_type = WRP_MSG_TYPE__CREATE;
-			parStrncpy((*msg)->u.crud.dest,"mac:1122334455/parodus", 100);
-                        (*msg)->u.crud.source = (char *) malloc(sizeof(char) *40);
-			parStrncpy ((*msg)->u.crud.source, "tag-update", 40);
-                        (*msg)->u.crud.transaction_uuid = (char *) malloc(sizeof(char) *40);
-			parStrncpy ((*msg)->u.crud.transaction_uuid, "1234", 40);
-	}
+    (*msg)->msg_type = WRP_MSG_TYPE__REQ;
+    (*msg)->u.req.dest = (char *) malloc(sizeof(char) *100);
+    (*msg)->u.req.partner_ids = (partners_t *) malloc(sizeof(partners_t));
+    (*msg)->u.req.partner_ids->count = 1;
+    (*msg)->u.req.partner_ids->partner_ids[0] = (char *) malloc(sizeof(char) *64);
+    strcpy((*msg)->u.req.dest,"mac:1122334455/iot");
+    strcpy((*msg)->u.req.partner_ids->partner_ids[0],"comcast");
    return (ssize_t) mock();
 }

@@ -114,8 +93,8 @@ void test_listenerOnMessage()
    expect_function_calls(wrp_to_struct, 1);
    reg_list_item_t *head = (reg_list_item_t *) malloc(sizeof(reg_list_item_t));
    memset(head, 0, sizeof(reg_list_item_t));
-    parStrncpy(head->service_name, "iot", sizeof(head->service_name));
-    parStrncpy(head->url, "tcp://10.0.0.1:6600", sizeof(head->url));
+    strcpy(head->service_name, "iot");
+    strcpy(head->url, "tcp://10.0.0.1:6600");

    will_return(get_numOfClients, 1);
    expect_function_call(get_numOfClients);
@@ -137,19 +116,19 @@ void test_listenerOnMessageMultipleClients()

    reg_list_item_t *head2 = (reg_list_item_t *) malloc(sizeof(reg_list_item_t));
    memset(head2, 0, sizeof(reg_list_item_t));
-    parStrncpy(head2->service_name, "iot", sizeof(head2->service_name));
-    parStrncpy(head2->url, "tcp://10.0.0.1:6622", sizeof(head2->url));
+    strcpy(head2->service_name, "iot");
+    strcpy(head2->url, "tcp://10.0.0.1:6622");
    
    reg_list_item_t *head1 = (reg_list_item_t *) malloc(sizeof(reg_list_item_t));
    memset(head1, 0, sizeof(reg_list_item_t));
-    parStrncpy(head1->service_name, "lmlite", sizeof(head1->service_name));
-    parStrncpy(head1->url, "tcp://10.0.0.1:6611", sizeof(head1->url));
+    strcpy(head1->service_name, "lmlite");
+    strcpy(head1->url, "tcp://10.0.0.1:6611");
    head1->next = head2;
    
    reg_list_item_t *head = (reg_list_item_t *) malloc(sizeof(reg_list_item_t));
    memset(head, 0, sizeof(reg_list_item_t));
-    parStrncpy(head->service_name, "config", sizeof(head->service_name));
-    parStrncpy(head->url, "tcp://10.0.0.1:6600", sizeof(head->url));
+    strcpy(head->service_name, "config");
+    strcpy(head->url, "tcp://10.0.0.1:6600");
    head->next = head1;
    
    will_return(get_numOfClients, 3);
@@ -210,23 +189,6 @@ void err_listenerOnMessageAllNull()
    listenerOnMessage(NULL, 0);
 }

-
-void test_listenerOnMessageCRUD()
-{
-	crud_test = 1;
-    will_return(wrp_to_struct, 2);
-    expect_function_calls(wrp_to_struct, 1);
-
-    will_return(get_numOfClients, 0);
-    expect_function_call(get_numOfClients);
-    will_return(validate_partner_id, 0);
-    expect_function_call(validate_partner_id);
-    will_return(get_global_node, (intptr_t)NULL);
-    expect_function_call(get_global_node);
-    expect_function_call(addCRUDmsgToQueue);
-    listenerOnMessage("Hello", 6);
-}
-
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
@@ -240,7 +202,6 @@ int main(void)
        cmocka_unit_test(err_listenerOnMessageServiceUnavailable),
        cmocka_unit_test(err_listenerOnMessageInvalidPartnerId),
        cmocka_unit_test(err_listenerOnMessageAllNull),
-        cmocka_unit_test(test_listenerOnMessageCRUD),
    };

    return cmocka_run_group_tests(tests, NULL, NULL);
--- a/tests/test_downstream_more.c
+++ b/tests/test_downstream_more.c
@@ -1,325 +0,0 @@
-/**
- *  Copyright 2017 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 <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <wrp-c.h>
-
-#include <CUnit/Basic.h>
-
-#include "../src/downstream.h"
-
-/*----------------------------------------------------------------------------*/
-/*                                   Macros                                   */
-/*----------------------------------------------------------------------------*/
-/* none */
-
-/*----------------------------------------------------------------------------*/
-/*                               Data Structures                              */
-/*----------------------------------------------------------------------------*/
-typedef struct {
-    wrp_msg_t s;
-    wrp_msg_t r;
-} test_t;
-
-/*----------------------------------------------------------------------------*/
-/*                            File Scoped Variables                           */
-/*----------------------------------------------------------------------------*/
-static test_t tests[] = {
-        {
-            .s.msg_type = WRP_MSG_TYPE__CREATE,
-            .s.u.crud.transaction_uuid = "c2bb1f16-09c8-11e7-93ae-92361f002671",
-            .s.u.crud.source = "fake-server1",
-            .s.u.crud.dest = "fake-client1/iot",
-            .s.u.crud.partner_ids = NULL,
-            .s.u.crud.headers = NULL,
-            .s.u.crud.metadata = NULL,
-            .s.u.crud.include_spans = false,
-            .s.u.crud.spans.spans = NULL,
-            .s.u.crud.spans.count = 0,
-            .s.u.crud.path = "Some path",
-            .s.u.crud.payload = "Some binary",
-            .s.u.crud.payload_size = 11,
-
-            .r.msg_type = WRP_MSG_TYPE__CREATE,
-            .r.u.crud.transaction_uuid = "c2bb1f16-09c8-11e7-93ae-92361f002671",
-            .r.u.crud.source = "fake-client1/iot",
-            .r.u.crud.dest = "fake-server1",
-            .r.u.crud.partner_ids = NULL,
-            .r.u.crud.headers = NULL,
-            .r.u.crud.metadata = NULL,
-            .r.u.crud.include_spans = false,
-            .r.u.crud.spans.spans = NULL,
-            .r.u.crud.spans.count = 0,
-            .r.u.crud.path = "Some path",
-            .r.u.crud.payload = "{\"statusCode\":531,\"message\":\"Service Unavailable\"}",
-            .r.u.crud.payload_size = 50,
-        },
-
-        {
-            .s.msg_type = WRP_MSG_TYPE__RETREIVE,
-            .s.u.crud.transaction_uuid = "c2bb1f16-09c8-11e7-93ae-92361f002671",
-            .s.u.crud.source = "fake-server2",
-            .s.u.crud.dest = "fake-client2/iot",
-            .s.u.crud.partner_ids = NULL,
-            .s.u.crud.headers = NULL,
-            .s.u.crud.metadata = NULL,
-            .s.u.crud.include_spans = false,
-            .s.u.crud.spans.spans = NULL,
-            .s.u.crud.spans.count = 0,
-            .s.u.crud.path = "Some path",
-            .s.u.crud.payload = NULL,
-            .s.u.crud.payload_size = 0,
-
-            .r.msg_type = WRP_MSG_TYPE__RETREIVE,
-            .r.u.crud.transaction_uuid = "c2bb1f16-09c8-11e7-93ae-92361f002671",
-            .r.u.crud.source = "fake-client2/iot",
-            .r.u.crud.dest = "fake-server2",
-            .r.u.crud.partner_ids = NULL,
-            .r.u.crud.headers = NULL,
-            .r.u.crud.metadata = NULL,
-            .r.u.crud.include_spans = false,
-            .r.u.crud.spans.spans = NULL,
-            .r.u.crud.spans.count = 0,
-            .r.u.crud.path = "Some path",
-            .r.u.crud.payload = "{\"statusCode\":531,\"message\":\"Service Unavailable\"}",
-            .r.u.crud.payload_size = 50,
-        },
-
-        {
-            .s.msg_type = WRP_MSG_TYPE__UPDATE,
-            .s.u.crud.transaction_uuid = "c2bb1f16-09c8-11e7-93ae-92361f002671",
-            .s.u.crud.source = "fake-server3",
-            .s.u.crud.dest = "fake-client3/iot",
-            .s.u.crud.partner_ids = NULL,
-            .s.u.crud.headers = NULL,
-            .s.u.crud.metadata = NULL,
-            .s.u.crud.include_spans = false,
-            .s.u.crud.spans.spans = NULL,
-            .s.u.crud.spans.count = 0,
-            .s.u.crud.path = "Some path",
-            .s.u.crud.payload = NULL,
-            .s.u.crud.payload_size = 0,
-
-            .r.msg_type = WRP_MSG_TYPE__UPDATE,
-            .r.u.crud.transaction_uuid = "c2bb1f16-09c8-11e7-93ae-92361f002671",
-            .r.u.crud.source = "fake-client3/iot",
-            .r.u.crud.dest = "fake-server3",
-            .r.u.crud.partner_ids = NULL,
-            .r.u.crud.headers = NULL,
-            .r.u.crud.metadata = NULL,
-            .r.u.crud.include_spans = false,
-            .r.u.crud.spans.spans = NULL,
-            .r.u.crud.spans.count = 0,
-            .r.u.crud.path = "Some path",
-            .r.u.crud.payload = "{\"statusCode\":531,\"message\":\"Service Unavailable\"}",
-            .r.u.crud.payload_size = 50,
-        },
-
-        {
-            .s.msg_type = WRP_MSG_TYPE__DELETE,
-            .s.u.crud.transaction_uuid = "c2bb1f16-09c8-11e7-93ae-92361f002671",
-            .s.u.crud.source = "fake-server4",
-            .s.u.crud.dest = "fake-client4/iot",
-            .s.u.crud.partner_ids = NULL,
-            .s.u.crud.headers = NULL,
-            .s.u.crud.metadata = NULL,
-            .s.u.crud.include_spans = false,
-            .s.u.crud.spans.spans = NULL,
-            .s.u.crud.spans.count = 0,
-            .s.u.crud.path = "Some path",
-            .s.u.crud.payload = NULL,
-            .s.u.crud.payload_size = 0,
-
-            .r.msg_type = WRP_MSG_TYPE__DELETE,
-            .r.u.crud.transaction_uuid = "c2bb1f16-09c8-11e7-93ae-92361f002671",
-            .r.u.crud.source = "fake-client4/iot",
-            .r.u.crud.dest = "fake-server4",
-            .r.u.crud.partner_ids = NULL,
-            .r.u.crud.headers = NULL,
-            .r.u.crud.metadata = NULL,
-            .r.u.crud.include_spans = false,
-            .r.u.crud.spans.spans = NULL,
-            .r.u.crud.spans.count = 0,
-            .r.u.crud.path = "Some path",
-            .r.u.crud.payload = "{\"statusCode\":531,\"message\":\"Service Unavailable\"}",
-            .r.u.crud.payload_size = 50,
-        },
-
-        {
-            .s.msg_type = WRP_MSG_TYPE__EVENT,
-            .s.u.event.source = "fake-server5",
-            .s.u.event.dest = "fake-client5/iot",
-            .s.u.event.partner_ids = NULL,
-            .s.u.event.headers = NULL,
-            .s.u.event.metadata = NULL,
-            .s.u.event.payload = NULL,
-            .s.u.event.payload_size = 0,
-
-            .r = {0},
-        },
-    };
-
-static uint8_t i;
-
-/*----------------------------------------------------------------------------*/
-/*                                   Mocks                                    */
-/*----------------------------------------------------------------------------*/
-void addCRUDmsgToQueue(wrp_msg_t *crudMsg)
-{
-	(void)crudMsg;
-	return;
-}
-
-int validate_partner_id(wrp_msg_t *msg, partners_t **partnerIds)
-{
-    (void) msg; (void) partnerIds;
-    return 1;
-}
-
-ssize_t wrp_to_struct( const void *bytes, const size_t length, const enum wrp_format fmt,
-                       wrp_msg_t **msg )
-{
-    (void) bytes; (void) length; (void) fmt;
-    *msg = (wrp_msg_t*) malloc(sizeof(wrp_msg_t));
-    (*msg)->msg_type = tests[i].s.msg_type;
-    if( WRP_MSG_TYPE__EVENT == tests[i].s.msg_type ) {
-        (*msg)->u.event.source = strdup(tests[i].s.u.event.source);
-        (*msg)->u.event.dest = strdup(tests[i].s.u.event.dest);
-    }
-    else
-    {
-        (*msg)->u.crud.source = strdup(tests[i].s.u.crud.source);
-        (*msg)->u.crud.dest = strdup(tests[i].s.u.crud.dest);
-        (*msg)->u.crud.transaction_uuid = strdup(tests[i].s.u.crud.transaction_uuid);
-        (*msg)->u.crud.path = strdup(tests[i].s.u.crud.path);
-    }
-    return (ssize_t) sizeof(tests[i].s);
-}
-
-ssize_t wrp_struct_to( const wrp_msg_t *msg, const enum wrp_format fmt, void **bytes )
-{
-    (void) fmt; 
-    *bytes = malloc(1);
-    CU_ASSERT(WRP_MSG_TYPE__EVENT != msg->msg_type);
-    CU_ASSERT(tests[i].r.msg_type == msg->msg_type);
-    CU_ASSERT_STRING_EQUAL(tests[i].r.u.crud.transaction_uuid, msg->u.crud.transaction_uuid);
-    printf("tests[%d].r.u.crud.source = %s, msg->u.crud.source = %s\n", i, tests[i].r.u.crud.source, msg->u.crud.source);
-    CU_ASSERT_STRING_EQUAL(tests[i].r.u.crud.source, msg->u.crud.source);
-    CU_ASSERT_STRING_EQUAL(tests[i].r.u.crud.dest, msg->u.crud.dest);
-    CU_ASSERT_STRING_EQUAL(tests[i].r.u.crud.path, msg->u.crud.path);
-    CU_ASSERT(tests[i].r.u.crud.payload_size == msg->u.crud.payload_size);
-    CU_ASSERT(0 == memcmp(tests[i].r.u.crud.payload, msg->u.crud.payload, msg->u.crud.payload_size));
-
-    return 1;
-}
-
-void sendUpstreamMsgToServer(void **resp_bytes, size_t resp_size)
-{
-    (void) resp_bytes; (void) resp_size;    
-}
-
-int get_numOfClients()
-{
-    return 0;
-}
-
-reg_list_item_t *get_global_node(void)
-{
-    return NULL;
-}
-
-void release_global_node (void)
-{
-}
-
-void wrp_free_struct( wrp_msg_t *msg )
-{
-    if( WRP_MSG_TYPE__EVENT == tests[i].s.msg_type ) {
-        if( NULL != msg->u.event.source) {
-            free(msg->u.event.source);
-        }
-        if( NULL != msg->u.event.dest) {
-            free(msg->u.event.dest);
-        }
-    }
-    else
-    {
-        if( NULL != msg->u.crud.source) {
-            free(msg->u.crud.source);
-        }
-        if( NULL != msg->u.crud.dest) {
-            free(msg->u.crud.dest);
-        }
-        if( NULL != msg->u.crud.transaction_uuid) {
-            free(msg->u.crud.transaction_uuid);
-        }
-        if( NULL != msg->u.crud.path) {
-            free(msg->u.crud.path);
-        }
-    }    
-}
-
-/*----------------------------------------------------------------------------*/
-/*                                   Tests                                    */
-/*----------------------------------------------------------------------------*/
-void test_listenerOnMessage()
-{
-    size_t t_size = sizeof(tests)/sizeof(test_t);
-    void *msg = malloc(1);
-
-    for( i = 0; i < t_size; i++ ) {
-        listenerOnMessage(msg, 0);
-    }
-    free(msg);
-}
-
-void add_suites( CU_pSuite *suite )
-{
-    printf("--------Start of Test Cases Execution ---------\n");
-    *suite = CU_add_suite( "tests", NULL, NULL );
-    CU_add_test( *suite, "Test 1", test_listenerOnMessage );
-}
-
-/*----------------------------------------------------------------------------*/
-/*                             External Functions                             */
-/*----------------------------------------------------------------------------*/
-int main( void )
-{
-    unsigned rv = 1;
-    CU_pSuite suite = NULL;
-
-    if( CUE_SUCCESS == CU_initialize_registry() ) {
-        add_suites( &suite );
-
-        if( NULL != suite ) {
-            CU_basic_set_mode( CU_BRM_VERBOSE );
-            CU_basic_run_tests();
-            printf( "\n" );
-            CU_basic_show_failures( CU_get_failure_list() );
-            printf( "\n\n" );
-            rv = CU_get_number_of_tests_failed();
-        }
-
-        CU_cleanup_registry();
-
-    }
-
-    return rv;
-}
-
--- a/tests/test_heartBeatTimer.c
+++ b/tests/test_heartBeatTimer.c
@@ -1,94 +0,0 @@
-/**
- * Copyright 2018 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 <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
-#include <pthread.h>
-
-#include "../src/heartBeat.h"
-#include "../src/parodus_log.h"
-
-/*----------------------------------------------------------------------------*/
-/*                                   Tests                                    */
-/*----------------------------------------------------------------------------*/
-void test_heartBeatTimer() {
-	/* get heartBeat timer's initial value */
-	unsigned int heartBeatTimer =5;
-	heartBeatTimer = get_heartBeatTimer();
-	ParodusInfo("heartBeatTimer initial vaule is: %d\n", heartBeatTimer);
-	assert_int_equal(heartBeatTimer, 0);
-
-	/* increment heartbeat timer value and check whether its returning modified value or not*/
-	unsigned int inc_time_ms =5;
-	increment_heartBeatTimer(inc_time_ms);
-	heartBeatTimer = get_heartBeatTimer();
-	ParodusInfo("heartBeatTimer incremented to: %d\n", heartBeatTimer);
-	assert_int_equal(heartBeatTimer,5);
-
-	/* reset heartBeat timer to 0 */
-	reset_heartBeatTimer();
-	heartBeatTimer = get_heartBeatTimer();
-	ParodusInfo("heartBeatTimer reset to: %d\n", heartBeatTimer);
-	assert_int_equal(heartBeatTimer,0);
-}
-
-void *test_mutexIncrementTimer() {
-	unsigned int inc_time_ms =5;
-	increment_heartBeatTimer(inc_time_ms);
-	return NULL;
-}
-
-void *test_mutexResetTimer() {
-	reset_heartBeatTimer();
-	return NULL;
-}
-void test_mutexHeartBeatTimer() {
-	unsigned int heartBeatTimer;
-	pthread_t thread[3];
-
-	pthread_create(&thread[0], NULL, test_mutexIncrementTimer, NULL);
-	pthread_create(&thread[1], NULL, test_mutexIncrementTimer, NULL);
-
-	pthread_join(thread[0], NULL);
-	pthread_join(thread[1], NULL);
-
-	/* After execution of both the threads check the value of timer */
-	heartBeatTimer = get_heartBeatTimer();
-	ParodusInfo("Threads execution is completed, heartBeatTimer is: %d\n", heartBeatTimer);
-	assert_int_equal(heartBeatTimer, 10);
-
-	pthread_create(&thread[2], NULL, test_mutexResetTimer, NULL);
-	pthread_join(thread[2], NULL);
-
-	heartBeatTimer = get_heartBeatTimer();
-	ParodusInfo("heartBeatTimer reset to: %d\n", heartBeatTimer);
-	assert_int_equal(heartBeatTimer, 0);
-}
-
-/*----------------------------------------------------------------------------*/
-/*                             External Functions                             */
-/*----------------------------------------------------------------------------*/
-int main(void)
-{
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test(test_heartBeatTimer),
-        cmocka_unit_test(test_mutexHeartBeatTimer),
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
--- a/tests/test_mutex.c
+++ b/tests/test_mutex.c
@@ -54,7 +54,9 @@ void* a(void *in)

    lockMutex(data->mutex);
    data->number++;
+    sleep(1);
    data->number++;
+    sleep(1);
    data->number++;
    unlockMutex(data->mutex);

@@ -67,7 +69,9 @@ void* b(void *in)

    lockMutex(data->mutex);
    data->number+=10;
+    sleep(1);
    data->number+=10;
+    sleep(1);
    data->number+=10;
    unlockMutex(data->mutex);

@@ -96,16 +100,15 @@ void test_Mutex()

 void err_mutex()
 {
-    static pthread_mutex_t mtx = PTHREAD_MUTEX_INITIALIZER;
-    noPollPtr mutex = &mtx;
+    noPollPtr mutex = (pthread_mutex_t*) malloc(sizeof(pthread_mutex_t));

    will_return(pthread_mutex_destroy, -1);
    destroyMutex(mutex);

    will_return(pthread_mutex_init, -1);
    mutex = createMutex();
-    destroyMutex(mutex);
-    
+
+    free(mutex);
 }

 void err_mutexNull()
--- a/tests/test_networking.c
+++ b/tests/test_networking.c
@@ -44,7 +44,7 @@
 /*----------------------------------------------------------------------------*/
 void test_checkHostIp()
 {
-    CU_ASSERT_EQUAL(0, checkHostIp("www.python.org"))
+    CU_ASSERT_EQUAL(0, checkHostIp("fabric.webpa.comcast.net"))
 }

 void add_suites( CU_pSuite *suite )
--- a/tests/test_nopoll_handlers.c
+++ b/tests/test_nopoll_handlers.c
@@ -29,7 +29,6 @@
 /*----------------------------------------------------------------------------*/
 volatile unsigned int heartBeatTimer;
 bool LastReasonStatus;
-int closeReason = 0;
 pthread_mutex_t close_mut;
 bool close_retry;
 /*----------------------------------------------------------------------------*/
@@ -41,16 +40,6 @@ void set_global_reconnect_reason(char *reason)
    (void) reason;
 }

-bool get_global_reconnect_status()
-{
-    return LastReasonStatus;
-}
-
-void set_global_reconnect_status(bool status)
-{
-    (void) status ;
-}
-
 const unsigned char *nopoll_msg_get_payload(noPollMsg *msg)
 {
    if( NULL != msg ) {
@@ -70,27 +59,12 @@ noPollOpCode nopoll_msg_opcode (noPollMsg * msg)
    return NOPOLL_UNKNOWN_OP_CODE;
 }

-nopoll_bool nopoll_msg_is_fragment(noPollMsg *msg)
-{
-    (void) msg;
-    return nopoll_false;
-}
-
 int nopoll_msg_get_payload_size(noPollMsg *msg)
 {
    (void) msg;
    return 1;
 }

-int nopoll_conn_get_close_status (noPollConn * conn)
-{
-	(void) conn;
-	if(closeReason)
-		return 1006;
-	else
-		return 0;
-}
-
 int nopoll_conn_send_frame (noPollConn * conn, nopoll_bool fin, nopoll_bool masked,
                            noPollOpCode op_code, long length, noPollPtr content, long sleep_in_header)

@@ -142,16 +116,16 @@ void *a1(void *in)
    char str[] = "SSL_Socket_Close";
    (void) in;

-    set_global_reconnect_status(false);
+    LastReasonStatus = false;
    listenerOnCloseMessage(NULL, NULL, NULL);
    
-    set_global_reconnect_status(false);
+    LastReasonStatus = false;
    listenerOnCloseMessage(NULL, NULL, (noPollPtr) str);

-    set_global_reconnect_status(true);
+    LastReasonStatus = true;
    listenerOnCloseMessage(NULL, NULL, NULL);
-    closeReason = 1;
-    set_global_reconnect_status(true);
+
+    LastReasonStatus = true;
    listenerOnCloseMessage(NULL, NULL, (noPollPtr) str);

    pthread_exit(0);
--- a/tests/test_nopoll_handlers_fragment.c
+++ b/tests/test_nopoll_handlers_fragment.c
@@ -1,138 +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 <stdarg.h>
-#include <stdbool.h>
-#include <CUnit/Basic.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
-#include <nopoll.h>
-#include <nopoll_private.h>
-#include <pthread.h>
-
-#include "../src/nopoll_handlers.h"
-#include "../src/parodus_log.h"
-
-/*----------------------------------------------------------------------------*/
-/*                            File Scoped Variables                           */
-/*----------------------------------------------------------------------------*/
-volatile unsigned int heartBeatTimer;
-bool LastReasonStatus;
-pthread_mutex_t close_mut;
-bool close_retry;
-/*----------------------------------------------------------------------------*/
-/*                                   Mocks                                    */
-/*----------------------------------------------------------------------------*/
-
-void set_global_reconnect_reason(char *reason)
-{
-    (void) reason;
-}
-
-bool get_global_reconnect_status()
-{
-    return LastReasonStatus;
-}
-
-void set_global_reconnect_status(bool status)
-{
-    (void) status ;
-}
-
-nopoll_bool nopoll_msg_is_fragment(noPollMsg *msg)
-{
-   (void)msg;
-    function_called();
-    return (nopoll_bool) mock();
-}
-
-nopoll_bool nopoll_msg_is_final(noPollMsg *msg)
-{
-    (void)msg;
-    function_called();
-    return (nopoll_bool) mock();
-}
-
-const unsigned char *nopoll_msg_get_payload(noPollMsg *msg)
-{
-	(void)msg;
-	function_called();
-	
-	
-	return (const unsigned char *) mock();
-}
-
-int nopoll_msg_get_payload_size(noPollMsg *msg)
-{
-    (void) msg;
-    function_called ();
-	return (int) mock();
-}
-
-/*----------------------------------------------------------------------------*/
-/*                                   Tests                                    */
-/*----------------------------------------------------------------------------*/
-
-void test_listenerOnMessage_queue_fragment()
-{
-   noPollMsg *msg, *msg1;
-   msg = nopoll_msg_new ();
-   //1st Fragment
-   msg->payload_size = strlen("hello");   
-   msg->payload = nopoll_new (char, msg->payload_size + 1);
-   
-    will_return(nopoll_msg_is_fragment, nopoll_true);
-    expect_function_call(nopoll_msg_is_fragment);
-    will_return(nopoll_msg_is_final, nopoll_false);
-    will_return(nopoll_msg_is_final, nopoll_false);
-    expect_function_calls(nopoll_msg_is_final, 2);
-    
-    listenerOnMessage_queue(NULL, NULL, msg, NULL);
-    
-    //2nd fragment/final message
-	msg1 = nopoll_msg_new ();
-	msg1->payload_size = strlen("world");   
-	msg1->payload = nopoll_new (char, msg->payload_size + 1);
-    
-    will_return(nopoll_msg_is_fragment, nopoll_true);
-    expect_function_call(nopoll_msg_is_fragment);
-    will_return(nopoll_msg_is_final, nopoll_true);
-    will_return(nopoll_msg_is_final, nopoll_true);
-    expect_function_calls(nopoll_msg_is_final, 2);
-    will_return(nopoll_msg_get_payload, (intptr_t)"helloworld");
-    expect_function_call(nopoll_msg_get_payload);
-    will_return(nopoll_msg_get_payload_size, 10);
-    
-    expect_function_call(nopoll_msg_get_payload_size);
-    listenerOnMessage_queue(NULL, NULL, msg1, NULL);
-    //release the message
-    nopoll_msg_unref(msg);
-    nopoll_msg_unref(msg1);    
-
-}
-
-
-/*----------------------------------------------------------------------------*/
-/*                             External Functions                             */
-/*----------------------------------------------------------------------------*/
-int main( void )
-{
-     const struct CMUnitTest tests[] = {
-        cmocka_unit_test(test_listenerOnMessage_queue_fragment),
-    };
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
--- a/tests/test_nopoll_helpers.c
+++ b/tests/test_nopoll_helpers.c
@@ -96,26 +96,6 @@ void listenerOnCloseMessage (noPollCtx * ctx, noPollConn * conn, noPollPtr user_
    UNUSED(ctx); UNUSED(conn); UNUSED(user_data);
 }

-void getCurrentTime(struct timespec *timer)
-{
-    (void) timer;
-    function_called();
-}
-
-long timeValDiff(struct timespec *starttime, struct timespec *finishtime)
-{
-    (void) starttime; (void) finishtime;
-    function_called();
-    return (long) mock();
-}
-
-int kill(pid_t pid, int sig)
-{
-    UNUSED(pid); UNUSED(sig);
-    function_called();
-    return (int) mock();
-}
-
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/
@@ -222,69 +202,6 @@ void test_sendMessage()
    sendMessage(conn, "Hello Parodus!", len);
 }

-void connStuck_sendMessage()
-{
-   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!");
@@ -317,9 +234,7 @@ void err_sendMessageConnNull()
    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);
 }

@@ -343,7 +258,6 @@ int main(void)
        cmocka_unit_test(err_sendResponseFlushWrites),
        cmocka_unit_test(err_sendResponseConnNull),
        cmocka_unit_test(test_sendMessage),
-        cmocka_unit_test(connStuck_sendMessage),
        cmocka_unit_test(err_sendMessage),
        cmocka_unit_test(err_sendMessageConnNull),
        cmocka_unit_test(test_reportLog),
--- a/tests/test_partners_check.c
+++ b/tests/test_partners_check.c
@@ -43,7 +43,7 @@ ParodusCfg *get_parodus_cfg(void)

 void test_validate_partner_id_for_req()
 {
-    static partners_t partner_ids = {3,{"shaw","","comcast"}};
+    static partners_t partner_ids = {1,{"comcast"}};
    wrp_msg_t *msg = (wrp_msg_t*) malloc(sizeof(wrp_msg_t));
    memset(msg, 0, sizeof(wrp_msg_t));
    msg->msg_type = WRP_MSG_TYPE__REQ;
@@ -51,32 +51,12 @@ void test_validate_partner_id_for_req()
    
    ParodusCfg cfg;
    memset(&cfg, 0, sizeof(ParodusCfg));
-    parStrncpy(cfg.partner_id, "shaw,bar,comcast", sizeof(cfg.partner_id));
+    strcpy(cfg.partner_id, "comcast");
    
    will_return(get_parodus_cfg, (intptr_t)&cfg);
    expect_function_call(get_parodus_cfg);
    int ret = validate_partner_id(msg, NULL); 
-    assert_int_equal(ret, 1);
-    free(msg);
-}
-
-void test_validate_partner_id_for_req_case_insensitive()
-{
-    static partners_t partner_ids = {2,{"Shaw","Comcast"}};
-    wrp_msg_t *msg = (wrp_msg_t*) malloc(sizeof(wrp_msg_t));
-    memset(msg, 0, sizeof(wrp_msg_t));
-    msg->msg_type = WRP_MSG_TYPE__REQ;
-    msg->u.req.partner_ids = &partner_ids;
-    
-    ParodusCfg cfg;
-    memset(&cfg, 0, sizeof(ParodusCfg));
-    parStrncpy(cfg.partner_id, "comcast", sizeof(cfg.partner_id));
-    
-    will_return(get_parodus_cfg, (intptr_t)&cfg);
-    expect_function_call(get_parodus_cfg);
-    int ret = validate_partner_id(msg, NULL); 
-    assert_int_equal(ret, 1);
-    free(msg);
+    assert_int_equal(ret, 1);  
 }

 void test_validate_partner_id_for_req_listNULL()
@@ -87,13 +67,12 @@ void test_validate_partner_id_for_req_listNULL()
    
    ParodusCfg cfg;
    memset(&cfg, 0, sizeof(ParodusCfg));
-    parStrncpy(cfg.partner_id, "*,comcast", sizeof(cfg.partner_id));
+    strcpy(cfg.partner_id, "comcast");
    
    will_return(get_parodus_cfg, (intptr_t)&cfg);
    expect_function_call(get_parodus_cfg);
    int ret = validate_partner_id(msg, NULL); 
-    assert_int_equal(ret, 1);
-    free(msg);
+    assert_int_equal(ret, 1);  
 }

 void test_validate_partner_id_for_req_withoutId()
@@ -108,8 +87,7 @@ void test_validate_partner_id_for_req_withoutId()
    will_return(get_parodus_cfg, (intptr_t)&cfg);
    expect_function_call(get_parodus_cfg);
    int ret = validate_partner_id(msg, NULL); 
-    assert_int_equal(ret, 0);
-    free(msg);
+    assert_int_equal(ret, 0);  
 }

 void err_validate_partner_id_for_req()
@@ -122,18 +100,17 @@ void err_validate_partner_id_for_req()
    
    ParodusCfg cfg;
    memset(&cfg, 0, sizeof(ParodusCfg));
-    parStrncpy(cfg.partner_id, "*,,comcast", sizeof(cfg.partner_id));
+    strcpy(cfg.partner_id, "comcast");
    
    will_return(get_parodus_cfg, (intptr_t)&cfg);
    expect_function_call(get_parodus_cfg);
    int ret = validate_partner_id(msg, NULL); 
-    assert_int_equal(ret, -1);
-    free(msg);
+    assert_int_equal(ret, -1);  
 }

 void test_validate_partner_id_for_event()
 {
-    static partners_t partner_ids = {4,{"shaw","","*","comcast"}};
+    static partners_t partner_ids = {1,{"comcast"}};
    wrp_msg_t *msg = (wrp_msg_t*) malloc(sizeof(wrp_msg_t));
    memset(msg, 0, sizeof(wrp_msg_t));
    msg->msg_type = WRP_MSG_TYPE__EVENT;
@@ -141,38 +118,14 @@ void test_validate_partner_id_for_event()
    
    ParodusCfg cfg;
    memset(&cfg, 0, sizeof(ParodusCfg));
-    parStrncpy(cfg.partner_id, "abc,*,comcast", sizeof(cfg.partner_id));
+    strcpy(cfg.partner_id, "comcast");
    
    will_return(get_parodus_cfg, (intptr_t)&cfg);
    expect_function_call(get_parodus_cfg);
    
    partners_t *list = NULL;
    int ret = validate_partner_id(msg, &list); 
-    assert_int_equal(ret, 1);
-    free(list);  
-    free(msg);
-}
-
-void test_validate_partner_id_for_event_case_insensitive()
-{
-    static partners_t partner_ids = {1,{"Comcast"}};
-    wrp_msg_t *msg = (wrp_msg_t*) malloc(sizeof(wrp_msg_t));
-    memset(msg, 0, sizeof(wrp_msg_t));
-    msg->msg_type = WRP_MSG_TYPE__EVENT;
-    msg->u.event.partner_ids = &partner_ids;
-    
-    ParodusCfg cfg;
-    memset(&cfg, 0, sizeof(ParodusCfg));
-    parStrncpy(cfg.partner_id, "*,comcast", sizeof(cfg.partner_id));
-    
-    will_return(get_parodus_cfg, (intptr_t)&cfg);
-    expect_function_call(get_parodus_cfg);
-    
-    partners_t *list = NULL;
-    int ret = validate_partner_id(msg, &list); 
-    assert_int_equal(ret, 1);
-    free(list);  
-    free(msg);
+    assert_int_equal(ret, 1);  
 }

 void test_validate_partner_id_for_event_listNULL()
@@ -183,7 +136,7 @@ void test_validate_partner_id_for_event_listNULL()
    
    ParodusCfg cfg;
    memset(&cfg, 0, sizeof(ParodusCfg));
-    parStrncpy(cfg.partner_id, "comcast", sizeof(cfg.partner_id));
+    strcpy(cfg.partner_id, "comcast");
    
    will_return(get_parodus_cfg, (intptr_t)&cfg);
    expect_function_call(get_parodus_cfg);
@@ -192,13 +145,6 @@ void test_validate_partner_id_for_event_listNULL()
    assert_int_equal(ret, 1); 
    assert_int_equal(list->count, 1);
    assert_string_equal(list->partner_ids[0], "comcast");
-    int i;
-    for(i = 0; i< (int) list->count; i++)
-    {
-        free(list->partner_ids[i]);
-    }
-    free(list);
-    free(msg);
 }

 void err_validate_partner_id_for_event()
@@ -213,25 +159,20 @@ void err_validate_partner_id_for_event()
    will_return(get_parodus_cfg, (intptr_t)&cfg);
    expect_function_call(get_parodus_cfg);
    int ret = validate_partner_id(msg, NULL); 
-    assert_int_equal(ret, 0);
-    free(msg);  
+    assert_int_equal(ret, 0);  
 }

 void test_validate_partner_id_for_event_withoutId()
 {
-    partners_t *partner_ids = (partners_t *) malloc(sizeof(partners_t));
-    partner_ids->count = 1;
-    partner_ids->partner_ids[0] = (char *) malloc(sizeof(char)*64);
-    parStrncpy(partner_ids->partner_ids[0], "shaw", 64);
-
+    static partners_t partner_ids = {1,{"shaw"}};
    wrp_msg_t *msg = (wrp_msg_t*) malloc(sizeof(wrp_msg_t));
    memset(msg, 0, sizeof(wrp_msg_t));
    msg->msg_type = WRP_MSG_TYPE__EVENT;
-    msg->u.event.partner_ids = partner_ids;
+    msg->u.event.partner_ids = &partner_ids;
    
    ParodusCfg cfg;
    memset(&cfg, 0, sizeof(ParodusCfg));
-    parStrncpy(cfg.partner_id, "comcast", sizeof(cfg.partner_id));
+    strcpy(cfg.partner_id, "comcast");
    
    will_return(get_parodus_cfg, (intptr_t)&cfg);
    expect_function_call(get_parodus_cfg);
@@ -241,14 +182,6 @@ void test_validate_partner_id_for_event_withoutId()
    assert_int_equal(list->count, 2);
    assert_string_equal(list->partner_ids[0], "shaw");
    assert_string_equal(list->partner_ids[1], "comcast");
-    int i;
-    for(i = 0; i< (int) list->count; i++)
-    {
-        free(list->partner_ids[i]);
-    }
-    free(list);
-    free(msg);
-    free(partner_ids);
 }

 /*----------------------------------------------------------------------------*/
@@ -259,12 +192,10 @@ int main(void)
 {
    const struct CMUnitTest tests[] = {
        cmocka_unit_test(test_validate_partner_id_for_req),
-	cmocka_unit_test(test_validate_partner_id_for_req_case_insensitive),
        cmocka_unit_test(test_validate_partner_id_for_req_listNULL),
        cmocka_unit_test(test_validate_partner_id_for_req_withoutId),
        cmocka_unit_test(err_validate_partner_id_for_req),
        cmocka_unit_test(test_validate_partner_id_for_event),
-	cmocka_unit_test(test_validate_partner_id_for_event_case_insensitive),
        cmocka_unit_test(test_validate_partner_id_for_event_listNULL),
        cmocka_unit_test(test_validate_partner_id_for_event_withoutId),
        cmocka_unit_test(err_validate_partner_id_for_event),
--- a/tests/test_service_alive.c
+++ b/tests/test_service_alive.c
@@ -33,33 +33,11 @@ static void *keep_alive_thread();
 static void add_client();
 int sock1;
 pthread_t threadId;
-pthread_mutex_t crud_mut=PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t crud_con=PTHREAD_COND_INITIALIZER;
-
-pthread_cond_t *get_global_crud_con(void)
-{
-    return &crud_con;
-}
-
-pthread_mutex_t *get_global_crud_mut(void)
-{
-    return &crud_mut;
-}

 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/

-void addCRUDmsgToQueue(wrp_msg_t *crudMsg)
-{
-	(void)crudMsg;
-	return;
-}
-
-void *CRUDHandlerTask()
-{
-	return NULL;
-}

 static void add_client()
 {
@@ -67,7 +45,6 @@ static void add_client()
 	  .u.reg.service_name = "service_client",
 	  .u.reg.url = TEST_SERVICE_URL};
 	  
-	pthread_t test_tid;
 	void *bytes;
 	int size =0;
 	int rv;
@@ -85,13 +62,11 @@ static void add_client()
 	ParodusPrint("decoded service_name:%s\n", message->u.reg.service_name);
 	ParodusPrint("decoded dest:%s\n", message->u.reg.url);
 	
-	StartThread(client_rcv_task, &test_tid);
+	StartThread(client_rcv_task);
 	status = addToList(&message);
 	ParodusPrint("addToList status is %d\n", status);
 	
 	CU_ASSERT_EQUAL( status, 0 );
-	wrp_free_struct(message);
-	free(bytes);
 	
 }

@@ -100,23 +75,13 @@ static void *client_rcv_task()
 	int byte =0;
 	int rv1=0;
 	int t=25000;
-	int rc = -1;
-	int bind;
 	wrp_msg_t  *msg1;

 	sock1 = nn_socket (AF_SP, NN_PULL);
-	bind = nn_bind(sock1, TEST_SERVICE_URL);
-	if(bind < 0)
-        {
-            ParodusError("Unable to bind socket (errno=%d, %s)\n",errno, strerror(errno));
-        }
+	nn_bind(sock1, TEST_SERVICE_URL);
 	
 	void *buf = NULL;
-	rc = nn_setsockopt(sock1, NN_SOL_SOCKET, NN_RCVTIMEO, &t, sizeof(t));
-	if(rc < 0)
-        {
-                ParodusError ("Unable to set socket timeout (errno=%d, %s)\n",errno, strerror(errno));
-        }
+	nn_setsockopt(sock1, NN_SOL_SOCKET, NN_RCVTIMEO, &t, sizeof(t));
 	
 	ParodusPrint("Client 1 waiting for acknowledgement \n");
 	byte = nn_recv(sock1, &buf, NN_MSG, 0);
@@ -137,21 +102,13 @@ static void *client_rcv_task()
 	return 0;	
 }

-static void handler(int signum)
-{
-	UNUSED(signum);
-	pthread_exit(NULL);
-}

 static void *keep_alive_thread()
 {
 	//ParodusPrint("keep_alive threadId is %d\n", threadId);
 	sleep(2);
 	ParodusPrint("Starting serviceAliveTask..\n");
-	while (true) {
-	  serviceAliveTask();
-	  sleep (30);
-	}
+	serviceAliveTask();
 	return 0;
 }

@@ -175,10 +132,9 @@ void test_keep_alive()
 	}
 	else
 	{
-		ParodusPrint("Thread created Successfully %p\n", threadId);
+		ParodusPrint("Thread created Successfully %d\n", (int ) threadId);
 	}    
 	sleep(3);
-	signal(SIGUSR1, handler);
 	
 	while( 1 ) 
 	{
@@ -188,9 +144,9 @@ void test_keep_alive()
 		if(byte >0)
 		{
 			ParodusInfo("Received keep alive msg!!! : %s \n", (char * )buf);
-            pthread_kill(threadId, SIGUSR1);
+			kill(threadId, SIGKILL);
 			
-			ParodusInfo("keep_alive_thread with tid %p is stopped\n", threadId);
+			ParodusInfo("keep_alive_thread with tid %d is stopped\n", threadId);
 			break;
 		}
 		else
@@ -219,6 +175,7 @@ void add_suites( CU_pSuite *suite )
    ParodusInfo("--------Start of Test Cases Execution ---------\n");
    *suite = CU_add_suite( "tests", NULL, NULL );
    CU_add_test( *suite, "Test 1", test_keep_alive );
+    
 }

 /*----------------------------------------------------------------------------*/
--- a/tests/test_seshat_interface.c
+++ b/tests/test_seshat_interface.c
@@ -1,187 +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 <stdarg.h>
-
-#include <stdbool.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
-#include <assert.h>
-#include <nopoll.h>
-
-#include "../src/ParodusInternal.h"
-#include "../src/seshat_interface.h"
-#include "../src/config.h"
-
-/*----------------------------------------------------------------------------*/
-/*                                   Macros                                   */
-/*----------------------------------------------------------------------------*/
-#define URL "url"
-#define LRU "lru"
-
-/*----------------------------------------------------------------------------*/
-/*                             Function Prototypes                            */
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/*                            File Scoped Variables                           */
-/*----------------------------------------------------------------------------*/
-ParodusCfg g_config;
-
-/*----------------------------------------------------------------------------*/
-/*                                   Mocks                                    */
-/*----------------------------------------------------------------------------*/
-ParodusCfg *get_parodus_cfg(void)
-{
-    return &g_config;
-}
-
-int init_lib_seshat (const char *url)
-{
-    UNUSED(url);
-    function_called();
-    return (int) mock();
-}
-
-int shutdown_seshat_lib (void)
-{
-    function_called();
-    return (int) mock();
-}
-
-int seshat_register(const char *service, const char *url)
-{
-    UNUSED(service); UNUSED(url);
-    function_called();
-    return (int) mock();
-}
-
-char* seshat_discover(const char *service)
-{
-    UNUSED(service);
-    function_called();
-    return (char *) mock();
-}
-
-int allow_insecure_conn(void)
-{
-    return 0;
-}
-
-/*----------------------------------------------------------------------------*/
-/*                                   Tests                                    */
-/*----------------------------------------------------------------------------*/
-void test_all_pass()
-{
-    parStrncpy(g_config.local_url, URL, sizeof(g_config.local_url));
-
-    will_return(init_lib_seshat, 0);
-    expect_function_call(init_lib_seshat);
-
-    will_return(seshat_register, 0);
-    expect_function_call(seshat_register);
-
-    char *d_url = malloc(sizeof(g_config.local_url));
-    parStrncpy(d_url, g_config.local_url, sizeof(g_config.local_url));
-    will_return(seshat_discover, d_url);
-    expect_function_call(seshat_discover);
-
-    will_return(shutdown_seshat_lib, 0);
-    expect_function_call(shutdown_seshat_lib);
-
-    assert_true(__registerWithSeshat());
-    memset(&g_config, '\0', sizeof(g_config));
-}
-
-void test_init_fail()
-{
-    will_return(init_lib_seshat, -1);
-    expect_function_call(init_lib_seshat);
-
-    will_return(shutdown_seshat_lib, 0);
-    expect_function_call(shutdown_seshat_lib);
-
-    assert_false(__registerWithSeshat());
-}
-
-void test_register_fail()
-{
-    will_return(init_lib_seshat, 0);
-    expect_function_call(init_lib_seshat);
-
-    will_return(seshat_register, -1);
-    expect_function_call(seshat_register);
-
-    will_return(shutdown_seshat_lib, 0);
-    expect_function_call(shutdown_seshat_lib);
-
-    assert_false(__registerWithSeshat());
-}
-
-void test_discover_fail()
-{
-    will_return(init_lib_seshat, 0);
-    expect_function_call(init_lib_seshat);
-
-    will_return(seshat_register, 0);
-    expect_function_call(seshat_register);
-
-    will_return(seshat_discover, 0);
-    expect_function_call(seshat_discover);
-
-    will_return(shutdown_seshat_lib, 0);
-    expect_function_call(shutdown_seshat_lib);
-
-    assert_false(__registerWithSeshat());
-}
-
-void test_discover_pass_but_lru_expected_fail()
-{
-    parStrncpy(g_config.local_url, URL, sizeof(g_config.local_url));
-
-    will_return(init_lib_seshat, 0);
-    expect_function_call(init_lib_seshat);
-
-    will_return(seshat_register, 0);
-    expect_function_call(seshat_register);
-
-    char *d_url = malloc(sizeof(g_config.local_url));
-    parStrncpy(d_url, LRU, sizeof(g_config.local_url));
-    will_return(seshat_discover, d_url);
-    expect_function_call(seshat_discover);
-
-    will_return(shutdown_seshat_lib, 0);
-    expect_function_call(shutdown_seshat_lib);
-
-    assert_false(__registerWithSeshat());
-}
-
-/*----------------------------------------------------------------------------*/
-/*                             External Functions                             */
-/*----------------------------------------------------------------------------*/
-int main(void)
-{
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test(test_all_pass),
-        cmocka_unit_test(test_init_fail),
-        cmocka_unit_test(test_register_fail),
-        cmocka_unit_test(test_discover_fail),
-        cmocka_unit_test(test_discover_pass_but_lru_expected_fail),
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
--- a/tests/test_seshat_interface_stub.c
+++ b/tests/test_seshat_interface_stub.c
@@ -1,61 +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 <stdarg.h>
-
-#include <stdbool.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
-#include <assert.h>
-
-#include "../src/seshat_interface.h"
-
-/*----------------------------------------------------------------------------*/
-/*                                   Macros                                   */
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/*                             Function Prototypes                            */
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/*                            File Scoped Variables                           */
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/*                                   Mocks                                    */
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/*                                   Tests                                    */
-/*----------------------------------------------------------------------------*/
-void test_registration()
-{
-    assert_true(__registerWithSeshat());
-}
-
-/*----------------------------------------------------------------------------*/
-/*                             External Functions                             */
-/*----------------------------------------------------------------------------*/
-int main(void)
-{
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test(test_registration),
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
--- a/tests/test_spin_thread_e.c
+++ b/tests/test_spin_thread_e.c
@@ -23,8 +23,6 @@
 #include "../src/ParodusInternal.h"
 #include "../src/spin_thread.h"

-pthread_t test_tid;
-
 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/
@@ -56,7 +54,7 @@ void *_routine(void *v)

 void test_StartThread_error()
 {
-    StartThread(&_routine, &test_tid);
+    StartThread(&_routine);
 }

 void add_suites( CU_pSuite *suite )
--- a/tests/test_spin_thread_s.c
+++ b/tests/test_spin_thread_s.c
@@ -23,8 +23,6 @@
 #include "../src/ParodusInternal.h"
 #include "../src/spin_thread.h"

-pthread_t test_tid;
-
 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/
@@ -46,7 +44,7 @@ void *_routine(void *v)

 void test_StartThread_success()
 {
-    StartThread(&_routine, &test_tid);
+    StartThread(&_routine);
 }

 void add_suites( CU_pSuite *suite )
--- a/tests/test_thread_tasks.c
+++ b/tests/test_thread_tasks.c
@@ -30,7 +30,6 @@
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
-bool g_shutdown  = false;
 ParodusMsg *ParodusMsgQ;
 pthread_mutex_t g_mutex;
 pthread_cond_t g_cond;
--- a/tests/test_token.c
+++ b/tests/test_token.c
@@ -1,742 +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 <stdarg.h>
-
-#include <CUnit/Basic.h>
-#include <stdbool.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <resolv.h>
-#include <cmocka.h>
-#include <assert.h>
-#include <cjwt/cjwt.h>
-#include <wrp-c.h>
-
-#include "../src/token.h"
-#include "../src/ParodusInternal.h"
-#include "../src/connection.h"
-#include "../src/config.h"
-
-const char *header  = "{	\"alg\":	\"RS256\",	\"typ\":	\"JWT\"}";
-
-time_t exp_time_good = 2147483647;    // 1/18/2038
-time_t exp_time_bad  = 1463955372;		// 5/22/2016
-
-
-const char *payload_good  = "{" \
-	"\"iss\":	\"SHA256:jdcRysFunWUAT852huQoIM9GN6k2s5c7iTMTMgujPAk\"," \
-	"\"endpoint\":	\"https://mydns.mycom.net:8080/\"}";
-
-const char *payload_insec  = "{" \
-	"\"iss\":	\"SHA256:jdcRysFunWUAT852huQoIM9GN6k2s5c7iTMTMgujPAk\"," \
-	"\"endpoint\":	\"http://mydns.mycom.net:8080/\"}";
-
-// missing endpoint
-const char *payload_no_end  = "{" \
-	"\"iss\":	\"SHA256:jdcRysFunWUAT852huQoIM9GN6k2s5c7iTMTMgujPAk\"}";
-
-const char *txt_record_id = "aabbccddeeff.test.webpa.comcast.net";
-
-#define MAX_RR_RECS 10
-
-/*
-expiration = 2147483647 #1/18/2038
-endpoint = "https://mydns.mycom.net:8080/"
-
-dns_rec_claims = {
-	'iss': u'SHA256:jdcRysFunWUAT852huQoIM9GN6k2s5c7iTMTMgujPAk', 
-	'endpoint': endpoint, 
-	'exp': expiration
-	}
-*/
-const char *dns_recs_test =
-	"\"03:iJmBr4pGROCCbRlbL3GpGDcSFJcaqBQFOriTRk0xKQ\"\n"
-	"\"01:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJTSEEyNTY6amRjUnlzRnVuV1VBVDg1Mmh1UW9JTTlHTjZrMnM1YzdpVE1UTWd1alBBayIsImVuZHBvaW50IjoiaHR0cHM6Ly9teWRucy5teWNvbS5uZXQ6ODA4MC8iLCJleHAiOjIxNDc0ODM2NDd9.VjG2PzPws2J707PiEaUGOTXD9NWnrGyfAUvvfyXFw-Px3gx5wg1\"\n"
-	"\"02:EXGyJQXrxMYuepAiFPT0sWxvydHvZKxcx7S5MCmlOhRpWZRrzgFceNWMwFcRPAPxovOoc4aYvx2DqGMdckmAD1q3y3Gjjw1qyxd4503jmrXKfjrdW3eFZD_Q454iRVf4c0CMWA5tl0ElOlX9u_HC3G_dPiKGUBU5PpWONgHpg2-ewrQcUe4-J4hBQmqZmRSB9n-6zB1XD80cDQO7aHeJ9aysJS1vgmwaSuT9y6PhPsp05NUC0TDzZVJUX\"\n"
-;
-
-const char *dns_recs_extra =
-	"\"03:iJmBr4pGROCCbRlbL3GpGDcSFJcaqBQFOriTRk0xKQ\"\n"
-	"\"01:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJTSEEyNTY6amRjUnlzRnVuV1VBVDg1Mmh1UW9JTTlHTjZrMnM1YzdpVE1UTWd1alBBayIsImVuZHBvaW50IjoiaHR0cHM6Ly9teWRucy5teWNvbS5uZXQ6ODA4MC8iLCJleHAiOjIxNDc0ODM2NDd9.VjG2PzPws2J707PiEaUGOTXD9NWnrGyfAUvvfyXFw-Px3gx5wg1\"\n"
-	"\n" // non-txt record type
-	"\"02:EXGyJQXrxMYuepAiFPT0sWxvydHvZKxcx7S5MCmlOhRpWZRrzgFceNWMwFcRPAPxovOoc4aYvx2DqGMdckmAD1q3y3Gjjw1qyxd4503jmrXKfjrdW3eFZD_Q454iRVf4c0CMWA5tl0ElOlX9u_HC3G_dPiKGUBU5PpWONgHpg2-ewrQcUe4-J4hBQmqZmRSB9n-6zB1XD80cDQO7aHeJ9aysJS1vgmwaSuT9y6PhPsp05NUC0TDzZVJUX\"\n"
-;
-
-char *rr_recs_test[] = {
-	"eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJTSEEyNTY6amRjUnlzRnVuV1VBVDg1Mmh1UW9JTTlHTjZrMnM1YzdpVE1UTWd1alBBayIsImVuZHBvaW50IjoiaHR0cHM6Ly9teWRucy5teWNvbS5uZXQ6ODA4MC8iLCJleHAiOjIxNDc0ODM2NDd9.VjG2PzPws2J707PiEaUGOTXD9NWnrGyfAUvvfyXFw-Px3gx5wg1",
-	"EXGyJQXrxMYuepAiFPT0sWxvydHvZKxcx7S5MCmlOhRpWZRrzgFceNWMwFcRPAPxovOoc4aYvx2DqGMdckmAD1q3y3Gjjw1qyxd4503jmrXKfjrdW3eFZD_Q454iRVf4c0CMWA5tl0ElOlX9u_HC3G_dPiKGUBU5PpWONgHpg2-ewrQcUe4-J4hBQmqZmRSB9n-6zB1XD80cDQO7aHeJ9aysJS1vgmwaSuT9y6PhPsp05NUC0TDzZVJUX",
-	"iJmBr4pGROCCbRlbL3GpGDcSFJcaqBQFOriTRk0xKQ"
-};
-
-char *dns_jwt_test = 
-	"eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJTSEEyNTY6amRjUnlzRnVuV1VBVDg1Mmh1UW9JTTlHTjZrMnM1YzdpVE1UTWd1alBBayIsImVuZHBvaW50IjoiaHR0cHM6Ly9teWRucy5teWNvbS5uZXQ6ODA4MC8iLCJleHAiOjIxNDc0ODM2NDd9.VjG2PzPws2J707PiEaUGOTXD9NWnrGyfAUvvfyXFw-Px3gx5wg1"
-	"EXGyJQXrxMYuepAiFPT0sWxvydHvZKxcx7S5MCmlOhRpWZRrzgFceNWMwFcRPAPxovOoc4aYvx2DqGMdckmAD1q3y3Gjjw1qyxd4503jmrXKfjrdW3eFZD_Q454iRVf4c0CMWA5tl0ElOlX9u_HC3G_dPiKGUBU5PpWONgHpg2-ewrQcUe4-J4hBQmqZmRSB9n-6zB1XD80cDQO7aHeJ9aysJS1vgmwaSuT9y6PhPsp05NUC0TDzZVJUX"
-	"iJmBr4pGROCCbRlbL3GpGDcSFJcaqBQFOriTRk0xKQ"
-;
-
-
-/*
-expiration = 2147483647 #1/18/2038
-endpoint = "https://mydns.mycom.net:8080/"
-
-dns_rec2_claims = {
-	'endpoint': endpoint
-	}
-*/
-// no exp in it
-const char *dns_recs2_test =
-	"\"eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbmRwb2ludCI6Imh0dHBzOi8vbXlkbnMubXljb20ubmV0OjgwODAvIn0.YkudDhp7Ifr6wTsCfrYUUeRf1CMKannC6Bx994OrcBVwqNQ1G5uBXEgsslUnbqV_7FTGPp1Vs058qncmIXtEYxVlHt-mn1UEm6hyC_QGi9FfMHYBS7QHwcCIs467XUFMZayQ3upzZNXObhzJNF0-RR72S61cjSGqf1z5KgyBtoANtW6xCdWB5VV6CqCxlmJNj6d4N8vKiUvN346-UgB_H4AuaXCNdXJ2NP2DxRec-oNTCjhNzRn-6MaB-UwW_gD9CYfQ0vrw2Nv8dO1Sk5Ku94cdIfvUEft-kyqPGKmK8soIggjvmvW0JEPYwrWYY9Ry5SQf80-dLOPXCQSQ3Rzy7Q\""
-;
-
-// no exp in it
-char *rr_recs2_test[] = {
-	"eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbmRwb2ludCI6Imh0dHBzOi8vbXlkbnMubXljb20ubmV0OjgwODAvIn0.YkudDhp7Ifr6wTsCfrYUUeRf1CMKannC6Bx994OrcBVwqNQ1G5uBXEgsslUnbqV_7FTGPp1Vs058qncmIXtEYxVlHt-mn1UEm6hyC_QGi9FfMHYBS7QHwcCIs467XUFMZayQ3upzZNXObhzJNF0-RR72S61cjSGqf1z5KgyBtoANtW6xCdWB5VV6CqCxlmJNj6d4N8vKiUvN346-UgB_H4AuaXCNdXJ2NP2DxRec-oNTCjhNzRn-6MaB-UwW_gD9CYfQ0vrw2Nv8dO1Sk5Ku94cdIfvUEft-kyqPGKmK8soIggjvmvW0JEPYwrWYY9Ry5SQf80-dLOPXCQSQ3Rzy7Q"
-};
-
-const char *dns_recs_err1 = // missing seq
-	"\"03:iJmBr4pGROCCbRlbL3GpGDcSFJcaqBQFOriTRk0xKQ\"\n"
-	"\"eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJTSEEyNTY6amRjUnlzRnVuV1VBVDg1Mmh1UW9JTTlHTjZrMnM1YzdpVE1UTWd1alBBayIsImVuZHBvaW50IjoiaHR0cHM6Ly9teWRucy5teWNvbS5uZXQ6ODA4MC8iLCJleHAiOjIxNDc0ODM2NDd9.VjG2PzPws2J707PiEaUGOTXD9NWnrGyfAUvvfyXFw-Px3gx5wg1\"\n"
-	"\"02:EXGyJQXrxMYuepAiFPT0sWxvydHvZKxcx7S5MCmlOhRpWZRrzgFceNWMwFcRPAPxovOoc4aYvx2DqGMdckmAD1q3y3Gjjw1qyxd4503jmrXKfjrdW3eFZD_Q454iRVf4c0CMWA5tl0ElOlX9u_HC3G_dPiKGUBU5PpWONgHpg2-ewrQcUe4-J4hBQmqZmRSB9n-6zB1XD80cDQO7aHeJ9aysJS1vgmwaSuT9y6PhPsp05NUC0TDzZVJUX\"\n"
-;
-
-const char *dns_recs_err2 = // invalid seq
-	"\"03:iJmBr4pGROCCbRlbL3GpGDcSFJcaqBQFOriTRk0xKQ\"\n"
-	"\"0:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJTSEEyNTY6amRjUnlzRnVuV1VBVDg1Mmh1UW9JTTlHTjZrMnM1YzdpVE1UTWd1alBBayIsImVuZHBvaW50IjoiaHR0cHM6Ly9teWRucy5teWNvbS5uZXQ6ODA4MC8iLCJleHAiOjIxNDc0ODM2NDd9.VjG2PzPws2J707PiEaUGOTXD9NWnrGyfAUvvfyXFw-Px3gx5wg1\"\n"
-	"\"02:EXGyJQXrxMYuepAiFPT0sWxvydHvZKxcx7S5MCmlOhRpWZRrzgFceNWMwFcRPAPxovOoc4aYvx2DqGMdckmAD1q3y3Gjjw1qyxd4503jmrXKfjrdW3eFZD_Q454iRVf4c0CMWA5tl0ElOlX9u_HC3G_dPiKGUBU5PpWONgHpg2-ewrQcUe4-J4hBQmqZmRSB9n-6zB1XD80cDQO7aHeJ9aysJS1vgmwaSuT9y6PhPsp05NUC0TDzZVJUX\"\n"
-;
-
-const char *dns_recs_err3 = // invalid seq too high
-	"\"03:iJmBr4pGROCCbRlbL3GpGDcSFJcaqBQFOriTRk0xKQ\"\n"
-	"\"99:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJTSEEyNTY6amRjUnlzRnVuV1VBVDg1Mmh1UW9JTTlHTjZrMnM1YzdpVE1UTWd1alBBayIsImVuZHBvaW50IjoiaHR0cHM6Ly9teWRucy5teWNvbS5uZXQ6ODA4MC8iLCJleHAiOjIxNDc0ODM2NDd9.VjG2PzPws2J707PiEaUGOTXD9NWnrGyfAUvvfyXFw-Px3gx5wg1\"\n"
-	"\"02:EXGyJQXrxMYuepAiFPT0sWxvydHvZKxcx7S5MCmlOhRpWZRrzgFceNWMwFcRPAPxovOoc4aYvx2DqGMdckmAD1q3y3Gjjw1qyxd4503jmrXKfjrdW3eFZD_Q454iRVf4c0CMWA5tl0ElOlX9u_HC3G_dPiKGUBU5PpWONgHpg2-ewrQcUe4-J4hBQmqZmRSB9n-6zB1XD80cDQO7aHeJ9aysJS1vgmwaSuT9y6PhPsp05NUC0TDzZVJUX\"\n"
-;
-
-const char *dns_recs_err4 = // duplicate seq number
-	"\"03:iJmBr4pGROCCbRlbL3GpGDcSFJcaqBQFOriTRk0xKQ\"\n"
-	"\"03:iJmBr4pGROCCbRlbL3GpGDcSFJcaqBQFOriTRk0xKQ\"\n"
-	"\"01:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJTSEEyNTY6amRjUnlzRnVuV1VBVDg1Mmh1UW9JTTlHTjZrMnM1YzdpVE1UTWd1alBBayIsImVuZHBvaW50IjoiaHR0cHM6Ly9teWRucy5teWNvbS5uZXQ6ODA4MC8iLCJleHAiOjIxNDc0ODM2NDd9.VjG2PzPws2J707PiEaUGOTXD9NWnrGyfAUvvfyXFw-Px3gx5wg1\"\n"
-	"\"02:EXGyJQXrxMYuepAiFPT0sWxvydHvZKxcx7S5MCmlOhRpWZRrzgFceNWMwFcRPAPxovOoc4aYvx2DqGMdckmAD1q3y3Gjjw1qyxd4503jmrXKfjrdW3eFZD_Q454iRVf4c0CMWA5tl0ElOlX9u_HC3G_dPiKGUBU5PpWONgHpg2-ewrQcUe4-J4hBQmqZmRSB9n-6zB1XD80cDQO7aHeJ9aysJS1vgmwaSuT9y6PhPsp05NUC0TDzZVJUX\"\n"
-;
-
-const char *dns_recs_err5 = // missing rec 1
-	"\"03:iJmBr4pGROCCbRlbL3GpGDcSFJcaqBQFOriTRk0xKQ\"\n"
-	"\n" // non-txt record type
-	"\"02:EXGyJQXrxMYuepAiFPT0sWxvydHvZKxcx7S5MCmlOhRpWZRrzgFceNWMwFcRPAPxovOoc4aYvx2DqGMdckmAD1q3y3Gjjw1qyxd4503jmrXKfjrdW3eFZD_Q454iRVf4c0CMWA5tl0ElOlX9u_HC3G_dPiKGUBU5PpWONgHpg2-ewrQcUe4-J4hBQmqZmRSB9n-6zB1XD80cDQO7aHeJ9aysJS1vgmwaSuT9y6PhPsp05NUC0TDzZVJUX\"\n"
-;
-
-cjwt_t jwt1;	// secure, payload good
-cjwt_t jwt2;	// secure, payload good, but expired
-cjwt_t jwt3;	// insecure
-cjwt_t jwt4;	// missing endpoint
-
-// internal functions in token.c to be tested
-extern int analyze_jwt (const cjwt_t *jwt, char **url_buf, unsigned int *port);
-extern bool validate_algo(const cjwt_t *jwt);
-extern int nquery(const char* dns_txt_record_id,u_char *nsbuf);
-extern bool valid_b64_char (char c);
-extern const char *strip_rr_data (const char *rr_ptr, int *rrlen);
-extern int find_seq_num (const char *rr_ptr, int rrlen);
-extern int get_rr_seq_num (const char *rr_ptr, int rrlen);
-extern int get_rr_seq_table (ns_msg *msg_handle, int num_rr_recs, rr_rec_t *seq_table);
-extern int assemble_jwt_from_dns (ns_msg *msg_handle, int num_rr_recs, char *jwt_ans);
-extern int query_dns(const char* dns_txt_record_id,char *jwt_ans);
-extern void read_key_from_file (const char *fname, char *buf, size_t buflen);
-extern const char *get_tok (const char *src, int delim, char *result, int resultsize);
-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;
-
-pthread_cond_t *get_global_crud_con(void)
-{
-    return &crud_con;
-}
-
-pthread_mutex_t *get_global_crud_mut(void)
-{
-    return &crud_mut;
-}
-
-void addCRUDmsgToQueue(wrp_msg_t *crudMsg)
-{
-	(void)crudMsg;
-	return;
-}
-
-void *CRUDHandlerTask()
-{
-	return NULL;
-}
-
-int setup_test_jwts (void)
-{
-	memset (&jwt1, 0, sizeof(cjwt_t));
-	jwt1.exp.tv_sec = exp_time_good;
-	jwt1.private_claims = cJSON_Parse ((char *) payload_good);
-	if (NULL == jwt1.private_claims) {
-		printf ("Invalid json struct payload_good\n");
-		return -1;
-	}
-
-	memset (&jwt2, 0, sizeof(cjwt_t));
-	jwt2.exp.tv_sec = exp_time_bad;
-	jwt2.private_claims = cJSON_Parse ((char *) payload_good);
-	if (NULL == jwt2.private_claims) {
-		printf ("Invalid json struct payload_good\n");
-		return -1;
-	}
-
-	memset (&jwt3, 0, sizeof(cjwt_t));
-	jwt3.exp.tv_sec = exp_time_good;
-	jwt3.private_claims = cJSON_Parse ((char *) payload_insec);
-	if (NULL == jwt3.private_claims) {
-		printf ("Invalid json struct payload_insec\n");
-		return -1;
-	}
-
-	memset (&jwt4, 0, sizeof(cjwt_t));
-	jwt4.exp.tv_sec = exp_time_good;
-	jwt4.private_claims = cJSON_Parse ((char *) payload_no_end);
-	if (NULL == jwt4.private_claims) {
-		printf ("Invalid json struct payload_good\n");
-		return -1;
-	}
-
-	return 0;
-}
-
-static int get_dns_text (const char *dns_rec_id, u_char *nsbuf, int bufsize)
-{
-	const char *rec = NULL;
-
-	if (strstr (dns_rec_id, ".test.") != NULL)
-		rec = dns_recs_test;
-	else if (strstr (dns_rec_id, ".extra.") != NULL)
-		rec = dns_recs_extra;
-	else if (strstr (dns_rec_id, ".test2.") != NULL)
-		rec = dns_recs2_test;
-	else if (strstr (dns_rec_id, ".err1.") != NULL)
-		rec = dns_recs_err1;
-	else if (strstr (dns_rec_id, ".err2.") != NULL)
-		rec = dns_recs_err2;
-	else if (strstr (dns_rec_id, ".err3.") != NULL)
-		rec = dns_recs_err3;
-	else if (strstr (dns_rec_id, ".err4.") != NULL)
-		rec = dns_recs_err4;
-	else if (strstr (dns_rec_id, ".err5.") != NULL)
-		rec = dns_recs_err5;
-	else
-		return -1;
-	strncpy ((char *) nsbuf, rec, bufsize);
-	return 0;
-}
-
-/*----------------------------------------------------------------------------*/
-/*                                   Mocks                                    */
-/*----------------------------------------------------------------------------*/
-
-// These mocks assume that the pieces of a dns txt record end with '\n';
-
-
-int ns_initparse(const u_char *nsbuf, int l, ns_msg *msg_handle)
-{
-	UNUSED(l);
-	char *buf = (char*) nsbuf;
-	char *next;
-	int i, count = 0;
-
-	msg_handle->_msg_ptr = nsbuf;
-	while (true)
-	{
-		if (buf[0] == 0)
-			break;
-		count++;
-		next = strchr (buf, '\n');
-		if (NULL == next)
-			break;
-		*next = 0;
-		buf = ++next;
-	}
-	for (i=0; i<ns_s_max; i++) {
-		if (i == ns_s_an)
-			msg_handle->_counts[i] = count;
-		else
-			msg_handle->_counts[i] = 0;
-	}
-	return 0;
-}
-
-int ns_parserr(ns_msg *msg_handle, ns_sect sect, int rec, ns_rr *rr)
-{
-	UNUSED(sect);
-	int i, l;
-	char *ptr = (char *) msg_handle->_msg_ptr;
-
-	if (rec >= msg_handle->_counts[ns_s_an]) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	for (i=0; i < rec; i++) {
-		l = strlen (ptr);
-		ptr += (l+1);
-	}
-
-	l = strlen(ptr);
-	if (l == 0) {
-		rr->type = ns_t_key;
-	} else {
-		rr->type = ns_t_txt;
-	}
-	rr->rdata = (u_char *) ptr;
-	rr->rdlength = l; 
-	return 0;
-}
-
-
-int		__res_ninit (res_state statp)
-{
-	UNUSED(statp);
-	function_called ();
-	return (int) mock();
-}
-
-int		__res_nquery (res_state statp, const char * txt_record, 
-			int class, int type_, u_char * buf, int bufsize)
-{
-	UNUSED(statp); UNUSED(class); UNUSED(type_);
-	int ret = get_dns_text (txt_record, buf, bufsize);
-	if (ret == 0)
-		return strlen ( (char*) buf); 
-	else
-		return -1;
-}
-
-void		__res_nclose (res_state statp)
-{
-	UNUSED (statp);
-	function_called ();
-}
-
-// Analyzes a jwt structure
-void test_analyze_jwt ()
-{
-    unsigned int port;
-    char *server_Address;
-	int ret = setup_test_jwts ();
-	assert_int_equal (ret, 0);
-	ret = analyze_jwt (&jwt1, &server_Address, &port);
-	assert_int_equal (ret, 0);
-	assert_string_equal (server_Address, "mydns.mycom.net");
-	assert_int_equal (port, 8080);
-	free (server_Address);
-	ret = analyze_jwt (&jwt2, &server_Address, &port);
-	assert_int_equal (ret, TOKEN_ERR_JWT_EXPIRED);
-	ret = analyze_jwt (&jwt3, &server_Address, &port);
-	assert_int_equal (ret, 1);
-	assert_string_equal (server_Address, "mydns.mycom.net");
-	assert_int_equal (port, 8080);
-	free (server_Address);
-	ret = analyze_jwt (&jwt4, &server_Address, &port);
-	assert_int_equal (ret, TOKEN_ERR_INVALID_JWT_CONTENT);
-}
-
-void test_validate_algo ()
-{
-	bool ret;
-	ParodusCfg cfg;
-	cfg.jwt_algo = 1025;
-	set_parodus_cfg (&cfg);
-	jwt1.header.alg = alg_rs256;
-	ret = validate_algo (&jwt1);
-	assert_int_equal (ret, 1);
-	jwt1.header.alg = alg_rs512;
-	ret = validate_algo (&jwt1);
-	assert_int_equal (ret, 0);
-}
-
-void test_nquery ()
-{
-	int len;
-	u_char nsbuf[8192];
-
-	will_return (__res_ninit, 0);
-	expect_function_call (__res_ninit);
-
-	expect_function_call (__res_nclose);
-
-	len = nquery (txt_record_id, nsbuf);
-	assert_int_equal (len, strlen(dns_recs_test));
-
-	will_return (__res_ninit, -1);
-	expect_function_call (__res_ninit);
-
-	len = nquery (txt_record_id, nsbuf);
-	assert_int_equal (len, -1);
-
-	will_return (__res_ninit, 0);
-	expect_function_call (__res_ninit);
-
-	len = nquery (".nosuch.", nsbuf);
-	assert_int_equal (len, -1);
-
-}
-
-void test_valid_b64_char()
-{
-	assert_int_equal (valid_b64_char ('A'), 1);
-	assert_int_equal (valid_b64_char ('@'), 0);
-}
-
-void test_strip_rrdata ()
-{
-	const char *s1 = "\"01:this-is-the-test-string-\"\n";
-	const char *s2 = "\"01:this-is-the-test-string-\n";
-	const char *ss1 =  "01:this-is-the-test-string-";
-	int s1len = strlen (ss1);
-	const char *result;
-  int rlen;
-
-	rlen = strlen (s1);
-	result = strip_rr_data (s1, &rlen);
-	assert_int_equal (rlen, s1len);
-	if (rlen == s1len) {
-		assert_int_equal (strncmp (result, ss1, rlen), 0);
-	}
-
-	rlen = strlen (s2);
-	result = strip_rr_data (s2, &rlen);
-	assert_int_equal (rlen, s1len);
-	if (rlen == s1len) {
-		assert_int_equal (strncmp (result, ss1, rlen), 0);
-	}
-}
-
-void test_find_seq_num ()
-{
-	int pos;
-	const char *s1 = "01:this-is-it";
-	const char *s2 = "1:this-is-it";
-	const char *s3 = ":this-is-it";
-	const char *s4 = ".01:this-is-it";
-	const char *s5 = "..01:this-is-it";
-	const char *s6 = "99999";
-	const char *s7 = "xxxxx";
-
-	pos = find_seq_num (s1, strlen(s1));
-	assert_int_equal (pos, 0);
-
-	pos = find_seq_num (s2, strlen(s2));
-	assert_int_equal (pos, -2);
-
-	pos = find_seq_num (s3, strlen(s3));
-	assert_int_equal (pos, -2);
-
-	pos = find_seq_num (s4, strlen(s4));
-	assert_int_equal (pos, 1);
-
-	pos = find_seq_num (s5, strlen(s5));
-	assert_int_equal (pos, 2);
-
-	pos = find_seq_num (s6, strlen(s6));
-	assert_int_equal (pos, -1);
-
-	pos = find_seq_num (s7, strlen(s7));
-	assert_int_equal (pos, -1);
-}
-
-void test_get_rr_seq_num ()
-{
-	int result;
-	const char *s1 = "01:this-is-it";
-	const char *s2 = "1:this-is-it";
-	const char *s3 = ":this-is-it";
-	const char *s4 = "11:this-is-it";
-
-	result = get_rr_seq_num (s1, strlen(s1));
-	assert_int_equal (result, 1);
-
-	result = get_rr_seq_num (s2, strlen(s2));
-	assert_int_equal (result, -1);
-
-	result = get_rr_seq_num (s3, strlen(s3));
-	assert_int_equal (result, -1);
-
-	result = get_rr_seq_num (s4, strlen(s4));
-	assert_int_equal (result, 11);
-}
-
-void test_get_rr_seq_table()
-{
-#define SEQ_TABLE_SIZE (MAX_RR_RECS + 1)
-	u_char nsbuf[4096];
-	ns_msg msg_handle;
-	int i, num_txt_recs, ret;
-	rr_rec_t seq_table[SEQ_TABLE_SIZE];
-
-	memset (&msg_handle, 0, sizeof(ns_msg));
-
-	ret = get_dns_text (".test.", nsbuf, 4096);
-	assert_int_equal (ret, 0);
-	ns_initparse (nsbuf, 4096, &msg_handle);
-	assert_int_equal (msg_handle._counts[ns_s_an],  3);
-	num_txt_recs = get_rr_seq_table (&msg_handle, 3, seq_table);
-	assert_int_equal (num_txt_recs, 3);
-	assert_ptr_equal (seq_table[0].rr_ptr, NULL);
-	for (i=0; i<3; i++) {
-		int len = strlen (rr_recs_test[i]);
-		assert_int_equal (len, seq_table[i+1].rr_len);
-		ret = strncmp (seq_table[i+1].rr_ptr, rr_recs_test[i], len);
-		assert_int_equal (ret, 0);
-	}
-
-	ret = get_dns_text (".test2.", nsbuf, 4096);
-	assert_int_equal (ret, 0);
-	ns_initparse (nsbuf, 4096, &msg_handle);
-	assert_int_equal (msg_handle._counts[ns_s_an],  1);
-	num_txt_recs = get_rr_seq_table (&msg_handle, 1, seq_table);
-	assert_int_equal (num_txt_recs, 1);
-	assert_ptr_not_equal (seq_table[0].rr_ptr, NULL);
-	if (NULL != seq_table[0].rr_ptr) {
-		int len = strlen (rr_recs2_test[0]);
-		assert_int_equal (len, seq_table[0].rr_len);
-		ret = strncmp (seq_table[0].rr_ptr, rr_recs2_test[0], len);
-		assert_int_equal (ret, 0);
-	}
-
-	ret = get_dns_text (".extra.", nsbuf, 4096);
-	assert_int_equal (ret, 0);
-	ns_initparse (nsbuf, 4096, &msg_handle);
-	assert_int_equal (msg_handle._counts[ns_s_an],  4);
-	num_txt_recs = get_rr_seq_table (&msg_handle, 4, seq_table);
-	assert_int_equal (num_txt_recs, 3);
-	assert_ptr_equal (seq_table[0].rr_ptr, NULL);
-	for (i=0; i<3; i++) {
-		int len = strlen (rr_recs_test[i]);
-		assert_int_equal (len, seq_table[i+1].rr_len);
-		ret = strncmp (seq_table[i+1].rr_ptr, rr_recs_test[i], len);
-		assert_int_equal (ret, 0);
-	}
-
-	ret = get_dns_text (".err1.", nsbuf, 4096);
-	assert_int_equal (ret, 0);
-	ns_initparse (nsbuf, 4096, &msg_handle);
-	assert_int_equal (msg_handle._counts[ns_s_an],  3);
-	num_txt_recs = get_rr_seq_table (&msg_handle, 3, seq_table);
-	assert_int_equal (num_txt_recs, -1);
-
-	ret = get_dns_text (".err2.", nsbuf, 4096);
-	assert_int_equal (ret, 0);
-	ns_initparse (nsbuf, 4096, &msg_handle);
-	assert_int_equal (msg_handle._counts[ns_s_an],  3);
-	num_txt_recs = get_rr_seq_table (&msg_handle, 3, seq_table);
-	assert_int_equal (num_txt_recs, -1);
-
-	ret = get_dns_text (".err3.", nsbuf, 4096);
-	assert_int_equal (ret, 0);
-	ns_initparse (nsbuf, 4096, &msg_handle);
-	assert_int_equal (msg_handle._counts[ns_s_an],  3);
-	num_txt_recs = get_rr_seq_table (&msg_handle, 3, seq_table);
-	assert_int_equal (num_txt_recs, -1);
-
-	ret = get_dns_text (".err4.", nsbuf, 4096);
-	assert_int_equal (ret, 0);
-	ns_initparse (nsbuf, 4096, &msg_handle);
-	assert_int_equal (msg_handle._counts[ns_s_an],  4);
-	num_txt_recs = get_rr_seq_table (&msg_handle, 4, seq_table);
-	assert_int_equal (num_txt_recs, -1);
-
-	ret = get_dns_text (".err5.", nsbuf, 4096);
-	assert_int_equal (ret, 0);
-	ns_initparse (nsbuf, 4096, &msg_handle);
-	assert_int_equal (msg_handle._counts[ns_s_an],  3);
-	num_txt_recs = get_rr_seq_table (&msg_handle, 3, seq_table);
-	assert_int_equal (num_txt_recs, -1);
-}
-
-void test_assemble_jwt_from_dns ()
-{
-	ns_msg msg_handle;
-	u_char nsbuf[4096];
-	char jwt_token[8192];
-	int ret;
-
-	memset (&msg_handle, 0, sizeof(ns_msg));
-
-	ret = get_dns_text (".test.", nsbuf, 4096);
-	assert_int_equal (ret, 0);
-	ns_initparse (nsbuf, 4096, &msg_handle);
-	assert_int_equal (msg_handle._counts[ns_s_an],  3);
-	ret = assemble_jwt_from_dns (&msg_handle, 3, jwt_token);
-	assert_int_equal (ret, 0);
-
-	ret = strcmp (dns_jwt_test, jwt_token);
-	assert_int_equal (ret, 0);
-
-	ret = get_dns_text (".err5.", nsbuf, 4096);
-	assert_int_equal (ret, 0);
-	ns_initparse (nsbuf, 4096, &msg_handle);
-	assert_int_equal (msg_handle._counts[ns_s_an],  3);
-	ret = assemble_jwt_from_dns (&msg_handle, 3, jwt_token);
-	assert_int_equal (ret, -1);
-
-}
-
-void test_query_dns ()
-{
-	int ret;
-	char jwt_buf[8192];
-
-	will_return (__res_ninit, 0);
-	expect_function_call (__res_ninit);
-	expect_function_call (__res_nclose);
-
-	ret = query_dns (txt_record_id, jwt_buf);
-	assert_int_equal (ret, 0);
-
-	will_return (__res_ninit, 0);
-	expect_function_call (__res_ninit);
-	//expect_function_call (__res_nclose);
-
-	ret = query_dns (".nosuch.", jwt_buf);
-	assert_int_equal (ret, -1);
-
-	will_return (__res_ninit, 0);
-	expect_function_call (__res_ninit);
-	expect_function_call (__res_nclose);
-
-	ret = query_dns (".err5.", jwt_buf);
-	assert_int_equal (ret, -1);
-}
-
-void test_allow_insecure_conn ()
-{
-	int insecure;
-	char *server_addr;
-	unsigned int port;
-	ParodusCfg *cfg = get_parodus_cfg();
-
-	parStrncpy (cfg->hw_mac, "aabbccddeeff", sizeof(cfg->hw_mac));
-	parStrncpy (cfg->dns_txt_url, "test.mydns.mycom.net", sizeof(cfg->dns_txt_url));
-	cfg->jwt_algo = 1025;
-
-	read_key_from_file ("../../tests/pubkey4.pem", cfg->jwt_key, 4096);
-
-	will_return (__res_ninit, 0);
-	expect_function_call (__res_ninit);
-	expect_function_call (__res_nclose);
-
-	insecure = allow_insecure_conn (&server_addr, &port);
-	free (server_addr);
-	assert_int_equal (insecure, 0);
-
-
-	parStrncpy (cfg->hw_mac, "aabbccddeeff", sizeof(cfg->hw_mac));
-	parStrncpy (cfg->dns_txt_url, "err5.mydns.mycom.net", sizeof(cfg->dns_txt_url));
-
-	will_return (__res_ninit, 0);
-	expect_function_call (__res_ninit);
-	expect_function_call (__res_nclose);
-
-	insecure = allow_insecure_conn (&server_addr, &port);
-	assert_int_equal (insecure, TOKEN_ERR_QUERY_DNS_FAIL);
-
-	parStrncpy (cfg->hw_mac, "aabbccddeeff", sizeof(cfg->hw_mac));
-	parStrncpy (cfg->dns_txt_url, "test.mydns.mycom.net", sizeof(cfg->dns_txt_url));
-	cfg->jwt_algo = 1024;
-	parStrncpy (cfg->jwt_key, "xxxxxxxxxx", sizeof(cfg->jwt_key));
-
-	will_return (__res_ninit, 0);
-	expect_function_call (__res_ninit);
-	expect_function_call (__res_nclose);
-
-	insecure = allow_insecure_conn (&server_addr, &port);
-	assert_int_equal (insecure, TOKEN_ERR_JWT_DECODE_FAIL);
-
-	parStrncpy (cfg->hw_mac, "aabbccddeeff", sizeof(cfg->hw_mac));
-	parStrncpy (cfg->dns_txt_url, "test.mydns.mycom.net", sizeof(cfg->dns_txt_url));
-	cfg->jwt_algo = 4097;
-	read_key_from_file ("../../tests/pubkey4.pem", cfg->jwt_key, 4096);
-
-	will_return (__res_ninit, 0);
-	expect_function_call (__res_ninit);
-	expect_function_call (__res_nclose);
-
-	insecure = allow_insecure_conn (&server_addr, &port);
-	assert_int_equal (insecure, TOKEN_ERR_ALGO_NOT_ALLOWED);
-
-}
-
-void test_get_tok()
-{
-	const char *str0 = "";
-	const char *str1 = "none";
-	const char *str2 = "none:rs256";
-	char result[20];
-	const char *next;
-
-	next = get_tok (str0, ':', result, 20);
-	assert_ptr_equal (next, NULL);
-	assert_int_equal ((int) result[0], 0);
-
-	next = get_tok (str1, ':', result, 20);
-	assert_string_equal (result, "none");
-	assert_ptr_equal (next, NULL);
-
-	next = get_tok (str2, ':', result, 20);
-	assert_string_equal (result, "none");
-	next = get_tok (next, ':', result, 20);
-	assert_string_equal (result, "rs256");
-	assert_ptr_equal (next, NULL);
-}
-
-void test_get_algo_mask ()
-{
-	unsigned mask;
-
-	mask = get_algo_mask ("rs256");
-	assert_int_equal ((int) mask, 1024);
-
-	mask = get_algo_mask ("rs512:rs256");
-	assert_int_equal ((int) mask, 5120);
-}
-
-/*----------------------------------------------------------------------------*/
-/*                             External Functions                             */
-/*----------------------------------------------------------------------------*/
-
-int main(void)
-{
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test(test_analyze_jwt),
-        cmocka_unit_test(test_validate_algo),
-        cmocka_unit_test(test_nquery),
-	cmocka_unit_test(test_valid_b64_char),
-	cmocka_unit_test(test_strip_rrdata),
-	cmocka_unit_test(test_find_seq_num),
-	cmocka_unit_test(test_get_rr_seq_num),
-	cmocka_unit_test(test_get_rr_seq_table),
-	cmocka_unit_test(test_assemble_jwt_from_dns),
-        cmocka_unit_test(test_query_dns),
-        cmocka_unit_test(test_allow_insecure_conn),
-        cmocka_unit_test(test_get_tok),
-        cmocka_unit_test(test_get_algo_mask),
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
-
--- a/tests/test_token_stub.c
+++ b/tests/test_token_stub.c
@@ -1,80 +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 <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 <wrp-c.h>
-#include <pthread.h>
-#include "../src/token.h"
-
-
-/*----------------------------------------------------------------------------*/
-/*                                   Mocks                                    */
-/*----------------------------------------------------------------------------*/
-
-
-pthread_mutex_t crud_mut=PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t crud_con=PTHREAD_COND_INITIALIZER;
-
-pthread_cond_t *get_global_crud_con(void)
-{
-    return &crud_con;
-}
-
-pthread_mutex_t *get_global_crud_mut(void)
-{
-    return &crud_mut;
-}
-
-void addCRUDmsgToQueue(wrp_msg_t *crudMsg)
-{
-	(void)crudMsg;
-	return;
-}
-
-void *CRUDHandlerTask()
-{
-	return NULL;
-}
-
-void test_allow_insecure_conn ()
-{
-	int insecure;
-	char *server_Address = NULL;
-	unsigned int port;
-	insecure = allow_insecure_conn (&server_Address, &port);
-	assert_int_equal (insecure, TOKEN_NO_DNS_QUERY);
-}
-
-/*----------------------------------------------------------------------------*/
-/*                             External Functions                             */
-/*----------------------------------------------------------------------------*/
-
-int main(void)
-{
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test(test_allow_insecure_conn),
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
-
--- a/tests/test_upstream.c
+++ b/tests/test_upstream.c
@@ -31,23 +31,17 @@
 #include "../src/client_list.h"
 #include "../src/ParodusInternal.h"
 #include "../src/partners_check.h"
-#include "../src/close_retry.h"

 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
 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 *temp = NULL;
-extern pthread_mutex_t nano_mut;
-extern pthread_cond_t nano_con;
-static int crud_test = 0;
 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/
@@ -68,51 +62,19 @@ reg_list_item_t * get_global_node(void)
    return mock_ptr_type(reg_list_item_t *);
 }

-void release_global_node (void)
-{
-}
-
 int get_numOfClients()
 {
    function_called();
    return (int)mock();
 }
-
-void addCRUDmsgToQueue(wrp_msg_t *crudMsg)
-{
-	(void)crudMsg;
-	function_called();
-	return;
-}
-
-int sendMsgtoRegisteredClients(char *dest,const char **Msg,size_t msgSize)
-{
-	UNUSED(dest); UNUSED(Msg); UNUSED(msgSize);
-	function_called();
-	return (int)mock();
-}
-
 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;
 }

@@ -129,7 +91,7 @@ size_t appendEncodedData( void **appendData, void *encodedBuffer, size_t encoded
    (void) encodedBuffer; (void) encodedSize; (void) metadataPack; (void) metadataSize;
    function_called();
    char *data = (char *) malloc (sizeof(char) * 100);
-    parStrncpy(data, "AAAAAAAAYYYYIGkYTUYFJH", 100);
+    strcpy(data, "AAAAAAAAYYYYIGkYTUYFJH");
    *appendData = data;
    return (size_t)mock();
 }
@@ -179,19 +141,7 @@ ssize_t wrp_to_struct( const void *bytes, const size_t length, const enum wrp_fo
 {
    UNUSED(bytes); UNUSED(length); UNUSED(fmt);
    function_called();
-    if(crud_test)
-    {
-		wrp_msg_t *resp_msg = NULL;
-		resp_msg = ( wrp_msg_t *)malloc( sizeof( wrp_msg_t ) );
-		memset(resp_msg, 0, sizeof(wrp_msg_t));
-		resp_msg->msg_type = 5;
-		resp_msg->u.crud.source = strdup("mac:14xxx/tags");
-		*msg = resp_msg;
-    }
-	else
-	{
-		*msg = temp;
-	}
+    *msg = temp;
    return (ssize_t)mock();
 }

@@ -260,8 +210,6 @@ void test_handleUpstreamNull()
    UpStreamMsgQ = NULL;
    will_return(nn_socket, 1);
    expect_function_call(nn_socket);
-    will_return(nn_setsockopt, 0);
-    expect_function_call(nn_setsockopt);
    will_return(nn_bind, 1);
    expect_function_call(nn_bind);
    will_return(nn_recv, 12);
@@ -281,23 +229,17 @@ void test_handle_upstream()
    UpStreamMsgQ->next->next = NULL;
    will_return(nn_socket, 1);
    expect_function_call(nn_socket);
-    will_return(nn_setsockopt, 0);
-    expect_function_call(nn_setsockopt);
    will_return(nn_bind, 1);
    expect_function_call(nn_bind);
    will_return(nn_recv, 12);
    expect_function_call(nn_recv);
    handle_upstream();
-    free(UpStreamMsgQ->next);
-    free(UpStreamMsgQ);
 }

 void err_handleUpstreamBindFailure()
 {
    will_return(nn_socket, 1);
    expect_function_call(nn_socket);
-    will_return(nn_setsockopt, 0);
-    expect_function_call(nn_setsockopt);
    will_return(nn_bind, -1);
    expect_function_call(nn_bind);
    handle_upstream();
@@ -336,47 +278,13 @@ void test_processUpstreamMessage()
    expect_function_call(appendEncodedData);

    expect_function_call(sendMessage);
-    will_return(nn_freemsg, 0);
-    expect_function_call(nn_freemsg);
+
    expect_function_call(wrp_free_struct);
+    will_return(nn_freemsg,1);
+    expect_function_call(nn_freemsg);

    processUpstreamMessage();
    free(temp);
-    free(UpStreamMsgQ->next);
-    free(UpStreamMsgQ);
-}
-
-void test_processUpstreamReqMessage()
-{
-    numLoops = 1;
-    metaPackSize = 20;
-    UpStreamMsgQ = (UpStreamMsg *) malloc(sizeof(UpStreamMsg));
-    UpStreamMsgQ->msg = "First Message";
-    UpStreamMsgQ->len = 13;
-    UpStreamMsgQ->next = (UpStreamMsg *) malloc(sizeof(UpStreamMsg));
-    UpStreamMsgQ->next->msg = "Second Message";
-    UpStreamMsgQ->next->len = 15;
-    UpStreamMsgQ->next->next = NULL;
-
-    temp = (wrp_msg_t *) malloc(sizeof(wrp_msg_t));
-    memset(temp,0,sizeof(wrp_msg_t));
-    temp->msg_type = 3;
-
-    will_return(wrp_to_struct, 12);
-    expect_function_call(wrp_to_struct);
-
-    will_return(appendEncodedData, 100);
-    expect_function_call(appendEncodedData);
-
-    expect_function_call(sendMessage);
-    will_return(nn_freemsg, 0);
-    expect_function_call(nn_freemsg);
-    expect_function_call(wrp_free_struct);
-
-    processUpstreamMessage();
-    free(temp);
-    free(UpStreamMsgQ->next);
-    free(UpStreamMsgQ);
 }

 void test_processUpstreamMessageInvalidPartner()
@@ -405,13 +313,12 @@ void test_processUpstreamMessageInvalidPartner()
    expect_function_call(appendEncodedData);

    expect_function_call(sendMessage);
-    will_return(nn_freemsg, 0);
-    expect_function_call(nn_freemsg);
+
    expect_function_call(wrp_free_struct);
+    will_return(nn_freemsg,1);
+    expect_function_call(nn_freemsg);
    processUpstreamMessage();
    free(temp);
-    free(UpStreamMsgQ->next);
-    free(UpStreamMsgQ);
 }

 void test_processUpstreamMessageRegMsg()
@@ -427,8 +334,8 @@ void test_processUpstreamMessageRegMsg()

    reg_list_item_t *head = (reg_list_item_t *) malloc(sizeof(reg_list_item_t));
    memset(head, 0, sizeof(reg_list_item_t));
-    parStrncpy(head->service_name, "iot", sizeof(head->service_name));
-    parStrncpy(head->url, "tcp://10.0.0.1:6600", sizeof(head->url));
+    strcpy(head->service_name, "iot");
+    strcpy(head->url, "tcp://10.0.0.1:6600");

    temp = (wrp_msg_t *) malloc(sizeof(wrp_msg_t));
    memset(temp,0,sizeof(wrp_msg_t));
@@ -439,12 +346,12 @@ void test_processUpstreamMessageRegMsg()
    will_return(wrp_to_struct, 12);
    expect_function_call(wrp_to_struct);

-    will_return(get_global_node, (intptr_t)head);
-    expect_function_call(get_global_node);
-
    will_return(get_numOfClients, 1);
    expect_function_call(get_numOfClients);

+    will_return(get_global_node, (intptr_t)head);
+    expect_function_call(get_global_node);
+
    will_return(nn_shutdown, 1);
    expect_function_call(nn_shutdown);

@@ -462,15 +369,14 @@ void test_processUpstreamMessageRegMsg()

    will_return(get_numOfClients, 1);
    expect_function_call(get_numOfClients);
-    will_return(nn_freemsg, 0);
-    expect_function_call(nn_freemsg);
+
    expect_function_call(wrp_free_struct);
+    will_return(nn_freemsg,1);
+    expect_function_call(nn_freemsg);

    processUpstreamMessage();
    free(temp);
    free(head);
-    free(UpStreamMsgQ->next);
-    free(UpStreamMsgQ);
 }

 void test_processUpstreamMessageRegMsgNoClients()
@@ -486,8 +392,8 @@ void test_processUpstreamMessageRegMsgNoClients()

    reg_list_item_t *head = (reg_list_item_t *) malloc(sizeof(reg_list_item_t));
    memset(head, 0, sizeof(reg_list_item_t));
-    parStrncpy(head->service_name, "iot", sizeof(head->service_name));
-    parStrncpy(head->url, "tcp://10.0.0.1:6600", sizeof(head->url));
+    strcpy(head->service_name, "iot");
+    strcpy(head->url, "tcp://10.0.0.1:6600");

    temp = (wrp_msg_t *) malloc(sizeof(wrp_msg_t));
    memset(temp,0,sizeof(wrp_msg_t));
@@ -498,23 +404,19 @@ void test_processUpstreamMessageRegMsgNoClients()
    will_return(wrp_to_struct, 12);
    expect_function_call(wrp_to_struct);

-    will_return(get_global_node, (intptr_t)head);
-    expect_function_call(get_global_node);
-
    will_return(get_numOfClients, 0);
    expect_function_call(get_numOfClients);

    will_return(addToList, 0);
    expect_function_call(addToList);
-    will_return(nn_freemsg, 0);
-    expect_function_call(nn_freemsg);
+
    expect_function_call(wrp_free_struct);
+    will_return(nn_freemsg,1);
+    expect_function_call(nn_freemsg);

    processUpstreamMessage();
    free(temp);
    free(head);
-    free(UpStreamMsgQ->next);
-    free(UpStreamMsgQ);
 }

 void err_processUpstreamMessage()
@@ -537,14 +439,14 @@ void err_processUpstreamMessageDecodeErr()
    temp = (wrp_msg_t *) malloc(sizeof(wrp_msg_t));
    memset(temp,0,sizeof(wrp_msg_t));
    temp->msg_type = 3;
+
    will_return(wrp_to_struct, -1);
    expect_function_call(wrp_to_struct);
-    will_return(nn_freemsg, 0);
-    expect_function_call(nn_freemsg);
    expect_function_call(wrp_free_struct);
+    will_return(nn_freemsg,1);
+    expect_function_call(nn_freemsg);
    processUpstreamMessage();
    free(temp);
-    free(UpStreamMsgQ);
 }

 void err_processUpstreamMessageMetapackFailure()
@@ -562,12 +464,12 @@ void err_processUpstreamMessageMetapackFailure()

    will_return(wrp_to_struct, 15);
    expect_function_call(wrp_to_struct);
-	will_return(nn_freemsg, 0);
-	expect_function_call(nn_freemsg);
+
    expect_function_call(wrp_free_struct);
+    will_return(nn_freemsg,1);
+    expect_function_call(nn_freemsg);
    processUpstreamMessage();
    free(temp);
-    free(UpStreamMsgQ);
 }

 void err_processUpstreamMessageRegMsg()
@@ -582,11 +484,11 @@ void err_processUpstreamMessageRegMsg()
    UpStreamMsgQ->next->next = NULL;

    reg_list_item_t *head = (reg_list_item_t *) malloc(sizeof(reg_list_item_t));
-    parStrncpy(head->service_name, "iot", sizeof(head->service_name));
-    parStrncpy(head->url, "tcp://10.0.0.1:6600", sizeof(head->url));
+    strcpy(head->service_name, "iot");
+    strcpy(head->url, "tcp://10.0.0.1:6600");
    head->next = (reg_list_item_t *) malloc(sizeof(reg_list_item_t));
-    parStrncpy(head->next->service_name, "iot", sizeof(head->service_name));
-    parStrncpy(head->next->url, "tcp://10.0.0.1:6600", sizeof(head->url));
+    strcpy(head->next->service_name, "iot");
+    strcpy(head->next->url, "tcp://10.0.0.1:6600");
    head->next->next = NULL;

    temp = (wrp_msg_t *) malloc(sizeof(wrp_msg_t));
@@ -598,12 +500,12 @@ void err_processUpstreamMessageRegMsg()
    will_return(wrp_to_struct, 12);
    expect_function_call(wrp_to_struct);

-    will_return(get_global_node, (intptr_t)head);
-    expect_function_call(get_global_node);
-
    will_return(get_numOfClients, 1);
    expect_function_call(get_numOfClients);

+    will_return(get_global_node, (intptr_t)head);
+    expect_function_call(get_global_node);
+
    will_return(nn_shutdown, -1);
    expect_function_call(nn_shutdown);

@@ -624,16 +526,14 @@ void err_processUpstreamMessageRegMsg()

    will_return(addToList, -1);
    expect_function_call(addToList);
-	will_return(nn_freemsg, 0);
-	expect_function_call(nn_freemsg);
+
    expect_function_call(wrp_free_struct);
+    will_return(nn_freemsg,1);
+    expect_function_call(nn_freemsg);

    processUpstreamMessage();
    free(temp);
-    free(head->next);
    free(head);
-    free(UpStreamMsgQ->next);
-    free(UpStreamMsgQ);
 }

 void test_sendUpstreamMsgToServer()
@@ -650,22 +550,6 @@ void test_sendUpstreamMsgToServer()
    expect_function_call(appendEncodedData);
    expect_function_call(sendMessage);
    sendUpstreamMsgToServer(&bytes, 110);
-    free(bytes);
-}
-
-void test_sendUpstreamMsg_close_retry()
-{
-	set_close_retry();
-	void *bytes = NULL;
-	wrp_msg_t msg;
-	memset(&msg, 0, sizeof(wrp_msg_t));
-	msg.msg_type = WRP_MSG_TYPE__EVENT;
-	wrp_struct_to( &msg, WRP_BYTES, &bytes );
-	metaPackSize = 10;
-	will_return(appendEncodedData, 100);
-	expect_function_call(appendEncodedData);
-	sendUpstreamMsgToServer(&bytes, 110);
-	free(bytes);
 }

 void err_sendUpstreamMsgToServer()
@@ -674,178 +558,6 @@ void err_sendUpstreamMsgToServer()
    sendUpstreamMsgToServer(NULL, 110);
 }

-void test_get_global_UpStreamMsgQ()
-{
-    assert_ptr_equal(UpStreamMsgQ, get_global_UpStreamMsgQ());
-}
-
-void test_set_global_UpStreamMsgQ()
-{
-	static UpStreamMsg *UpStreamQ;
-    UpStreamQ = (UpStreamMsg *) malloc(sizeof(UpStreamMsg));
-    UpStreamQ->msg = "First Message";
-    UpStreamQ->len = 13;
-    UpStreamQ->next = NULL;
-    set_global_UpStreamMsgQ(UpStreamQ);
-    assert_string_equal(UpStreamQ->msg, (char *)get_global_UpStreamMsgQ()->msg);
-    assert_int_equal(UpStreamQ->len, get_global_UpStreamMsgQ()->len);
-    free(UpStreamQ->next);
-    free(UpStreamQ);
-}
-
-void test_get_global_nano_con()
-{
-    assert_ptr_equal(&nano_con, get_global_nano_con());
-}
-
-void test_get_global_nano_mut()
-{
-    assert_ptr_equal(&nano_mut, get_global_nano_mut());
-}
-
-void test_processUpstreamMsgCrud_nnfree()
-{
-    numLoops = 1;
-    crud_test = 1;
-    metaPackSize = 0;
-    UpStreamMsgQ = (UpStreamMsg *) malloc(sizeof(UpStreamMsg));
-    UpStreamMsgQ->msg = "First Message";
-    UpStreamMsgQ->len = 13;
-    UpStreamMsgQ->next = NULL;
-
-    will_return(wrp_to_struct, 12);
-    expect_function_call(wrp_to_struct);
-	will_return(nn_freemsg, 0);
-    expect_function_call(nn_freemsg);
-    expect_function_call(wrp_free_struct);
-    processUpstreamMessage();
-    free(UpStreamMsgQ);
-    crud_test = 0;
-}
-
-void test_processUpstreamMsg_cloud_status()
-{
-    numLoops = 1;
-    metaPackSize = 20;
-	UpStreamMsgQ = (UpStreamMsg *) malloc(sizeof(UpStreamMsg));
-	UpStreamMsgQ->msg = "First Message";
-	UpStreamMsgQ->len = 13;
-	UpStreamMsgQ->next= NULL;
-	temp = (wrp_msg_t *) malloc(sizeof(wrp_msg_t));
-	memset(temp,0,sizeof(wrp_msg_t));
-	temp->msg_type = 6;
-	temp->u.crud.dest = "mac:14cfe2142xxx/parodus/cloud-status";
-	temp->u.crud.source = "mac:14cfe2142xxx/config";
-	temp->u.crud.transaction_uuid = "123";
-
-	will_return(wrp_to_struct, 12);
-	expect_function_call(wrp_to_struct);
-
-	expect_function_call(addCRUDmsgToQueue);
-
-	will_return(nn_freemsg, 0);
-	expect_function_call(nn_freemsg);
-	expect_function_call(wrp_free_struct);
-    processUpstreamMessage();
-    free(temp);
-    free(UpStreamMsgQ);
-    UpStreamMsgQ = NULL;
-}
-
-void test_processUpstreamMsg_sendToClient()
-{
-	numLoops = 2;
-	metaPackSize = 20;
-	UpStreamMsgQ = (UpStreamMsg *) malloc(sizeof(UpStreamMsg));
-	UpStreamMsgQ->msg = strdup("First Message");
-	UpStreamMsgQ->len = 13;
-	UpStreamMsgQ->next= NULL;
-	UpStreamMsgQ->next = (UpStreamMsg *) malloc(sizeof(UpStreamMsg));
-	UpStreamMsgQ->next->msg = strdup("Second Message");
-	UpStreamMsgQ->next->len = 15;
-	UpStreamMsgQ->next->next = NULL;
-
-	temp = (wrp_msg_t *) malloc(sizeof(wrp_msg_t));
-	memset(temp,0,sizeof(wrp_msg_t));
-	temp->msg_type = 6;
-	temp->u.crud.dest = strdup("mac:14cfe2142xxx/config");
-	temp->u.crud.source = strdup("mac:14cfe2142xxx/parodus/cloud-status");
-	temp->u.crud.transaction_uuid = strdup("123");
-
-	will_return(wrp_to_struct, 12);
-	expect_function_call(wrp_to_struct);
-
-	will_return(sendMsgtoRegisteredClients, 1);
-	expect_function_call(sendMsgtoRegisteredClients);
-
-	expect_function_call(wrp_free_struct);
-	will_return(wrp_to_struct, 12);
-	expect_function_call(wrp_to_struct);
-	will_return(sendMsgtoRegisteredClients, 0);
-	expect_function_call(sendMsgtoRegisteredClients);
-
-	expect_function_call(wrp_free_struct);
-	processUpstreamMessage();
-	free(temp);
-	free(UpStreamMsgQ);
-	UpStreamMsgQ = NULL;
-}
-
-void test_processUpstreamMsg_serviceNameNULL()
-{
-	numLoops = 1;
-	metaPackSize = 20;
-	UpStreamMsgQ = (UpStreamMsg *) malloc(sizeof(UpStreamMsg));
-	UpStreamMsgQ->msg = strdup("First Message");
-	UpStreamMsgQ->len = 13;
-	UpStreamMsgQ->next= NULL;
-	UpStreamMsgQ->next = (UpStreamMsg *) malloc(sizeof(UpStreamMsg));
-	UpStreamMsgQ->next->msg = strdup("Second Message");
-	UpStreamMsgQ->next->len = 15;
-	UpStreamMsgQ->next->next = NULL;
-
-	temp = (wrp_msg_t *) malloc(sizeof(wrp_msg_t));
-	memset(temp,0,sizeof(wrp_msg_t));
-	temp->msg_type = 6;
-	temp->u.crud.dest = strdup("mac:14cfe2142xxx/");
-	temp->u.crud.source = strdup("mac:14cfe2142xxx/parodus/cloud-status");
-	temp->u.crud.transaction_uuid = strdup("123");
-
-	will_return(wrp_to_struct, 12);
-	expect_function_call(wrp_to_struct);
-	expect_function_call(wrp_free_struct);
-	processUpstreamMessage();
-	free(temp);
-	free(UpStreamMsgQ);
-	UpStreamMsgQ = NULL;
-}
-
-void err_processUpstreamMsg_deviceID()
-{
-	numLoops = 1;
-	metaPackSize = 20;
-	deviceIDNull = 1;
-	UpStreamMsgQ = (UpStreamMsg *) malloc(sizeof(UpStreamMsg));
-	UpStreamMsgQ->msg = "First Message";
-	UpStreamMsgQ->len = 13;
-	UpStreamMsgQ->next= NULL;
-	temp = (wrp_msg_t *) malloc(sizeof(wrp_msg_t));
-	memset(temp,0,sizeof(wrp_msg_t));
-	temp->msg_type = 6;
-	temp->u.crud.dest = "mac:14cfe2142xxx/parodus/cloud-status";
-	temp->u.crud.source = "mac:14cfe2142xxx/config";
-	temp->u.crud.transaction_uuid = "123";
-
-	will_return(wrp_to_struct, 12);
-	expect_function_call(wrp_to_struct);
-	will_return(nn_freemsg, 0);
-	expect_function_call(nn_freemsg);
-	expect_function_call(wrp_free_struct);
-	processUpstreamMessage();
-	free(temp);
-	free(UpStreamMsgQ);
-	UpStreamMsgQ = NULL;
-}
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
@@ -860,7 +572,6 @@ int main(void)
        cmocka_unit_test(err_handleUpstreamBindFailure),
        cmocka_unit_test(err_handleUpstreamSockFailure),
        cmocka_unit_test(test_processUpstreamMessage),
-        cmocka_unit_test(test_processUpstreamReqMessage),
        cmocka_unit_test(test_processUpstreamMessageInvalidPartner),
        cmocka_unit_test(test_processUpstreamMessageRegMsg),
        cmocka_unit_test(test_processUpstreamMessageRegMsgNoClients),
@@ -869,17 +580,7 @@ int main(void)
        cmocka_unit_test(err_processUpstreamMessageMetapackFailure),
        cmocka_unit_test(err_processUpstreamMessageRegMsg),
        cmocka_unit_test(test_sendUpstreamMsgToServer),
-        cmocka_unit_test(test_sendUpstreamMsg_close_retry),
        cmocka_unit_test(err_sendUpstreamMsgToServer),
-        cmocka_unit_test(test_get_global_UpStreamMsgQ),
-        cmocka_unit_test(test_set_global_UpStreamMsgQ),
-        cmocka_unit_test(test_get_global_nano_con),
-        cmocka_unit_test(test_get_global_nano_mut),
-        cmocka_unit_test(test_processUpstreamMsgCrud_nnfree),
-        cmocka_unit_test(test_processUpstreamMsg_cloud_status),
-        cmocka_unit_test(test_processUpstreamMsg_sendToClient),
-	cmocka_unit_test(test_processUpstreamMsg_serviceNameNULL),
-	cmocka_unit_test(err_processUpstreamMsg_deviceID)
    };

    return cmocka_run_group_tests(tests, NULL, NULL);
--- a/tests/webpa-rs256.pem
+++ b/tests/webpa-rs256.pem
@@ -1,9 +0,0 @@
-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkZeQUMqDkMu/dQgTcycJ
-/rrgqfKQkoYFTMO7GnK87/OWiftHmtDJYPgktlcHheOPfkGln5ay1WJSitmtWNaH
-+RvBFK/ZsXpIuGm7R6wdSc7e6g9fTaSAfNX/+a8VxHUo58AinXxcq4LnHbuaGjEz
-jw77TLuZGyUuHiany8O8tc+DbnYKvRquScsccI6z/QwZKFtXUjJZ91hJ97zC8o7N
-Ae7n/Jg+Bs0uz9c1/bf/Jqbu6OidFbCr2FN42UupuAZ8DiPp2fWD5Q9qmp1ADk+V
-+TeZPxTCq/WB4dzSCd5v/FvFmO8tH6Ptkltij4pke7Dsi80TVRlcMDXAWxSFXOQV
-qwIDAQAB
-----END PUBLIC KEY-----
Author	SHA1	Message	Date
selvam krishnamoorthy	63e8b2baa0	Merge pull request #104 from selvamKrish/hostname-validation Hostname validation	2017-06-12 15:06:07 +05:30
Selvam Krishnamoorthy	6907fc8d13	Add outbound interface to nopoll options	2017-04-26 11:18:52 +05:30
Selvam Krishnamoorthy	7b3625b5ed	Handle Ipv6 and Ipv4 connection in parodus	2017-04-24 15:52:27 +05:30
Selvam Krishnamoorthy	b4c988c2ce	Use ipv4 when ipv6 connection fails to connect to server	2017-04-17 15:00:19 +05:30
Selvam Krishnamoorthy	c6c44af756	Modify code to support lastest nopoll changes	2017-04-14 17:33:58 +05:30
				`@@ -1,3 +0,0 @@`
				`sudo ./parodus --hw-model=TG1682 --hw-serial-number=Fer23u948590 --hw-manufacturer=ARRISGroup,Inc. --hw-mac=aabb33ddeeff --hw-last-reboot-reason=unknown --fw-name=TG1682_DEV_master_2016000000sdy --boot-time=123589 --webpa-ping-timeout=180 --webpa-backoff-max=0 --webpa-interface-used=p7p1 --webpa-url=https://example.net:8080 --acquire-jwt=1 --jwt-algo=RS256 --jwt-public-key-file=../../tests/webpa-rs256.pem --dns-txt-url=example.net`