Clear auth token if fetch fails

Merge pull request #239 from gbuddappagari/boot_time_fix
Handle unknown and * partner_id in parodus
2026-01-28 02:20:02 +00:00 · 2019-05-21 18:31:03 -07:00 · 2018-09-10 09:55:06 -07:00 · 2018-09-10 16:23:28 +05:30 · 2018-08-27 23:30:04 -07:00 · 2018-08-27 23:18:53 -07:00
59 changed files with 624 additions and 10128 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
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,45 +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]
- Refactor of connection code (simplification).
- Additional `/cloud-status` and `/cloud-disconnect` fields.
-
-## [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.
- Refactored connection.c and updated corresponding unit tests
-
-### 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/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,7 +71,7 @@ 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 "fbb9440ae2bc1118866baefcea7ff814f16613dd"
+    GIT_TAG "master"
    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_TESTING=OFF
 )
 add_library(libtrower-base64 STATIC SHARED IMPORTED)
@@ -83,7 +83,7 @@ add_dependencies(libtrower-base64 trower-base64)
 ExternalProject_Add(nopoll
    PREFIX ${PREFIX_DIR}/nopoll
    GIT_REPOSITORY https://github.com/Comcast/nopoll.git
-    GIT_TAG "739b740683b0615e5999bdeea756cbd593b7f1cc"
+    GIT_TAG "18e83e32bfccd1f308b4df0fe0aa3565302903a4"
    CONFIGURE_COMMAND COMMAND <SOURCE_DIR>/autogen.sh --prefix=${PREFIX}
                                                     --includedir=${INCLUDE_DIR}
                                                     --libdir=${LIBRARY_DIR}
@@ -99,7 +99,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 "0c1aa2b288f6b167dbafe7e29c20e6fc7e71c000"
+    #GIT_TAG "096998834451219ee7813d8977f6a4027b0ccb43"
    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
 )
 add_library(libnanomsg STATIC SHARED IMPORTED)
@@ -138,7 +138,7 @@ add_dependencies(libmsgpack msgpack)
 ExternalProject_Add(cimplog
    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/cimplog
    GIT_REPOSITORY https://github.com/Comcast/cimplog.git
-    GIT_TAG "8a5fb3c2f182241d17f5342bea5b7688c28cd1fd"
+    GIT_TAG "master"
    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_TESTING=OFF
 )
 add_library(libcimplog STATIC SHARED IMPORTED)
@@ -151,7 +151,7 @@ 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 "c2bc9be9dad6b0e4f7f9138f3d1074702ace7976"
+    GIT_TAG "master"
    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
                  -DMSGPACK_ENABLE_CXX=OFF
                  -DMSGPACK_BUILD_EXAMPLES=OFF
@@ -169,7 +169,7 @@ ExternalProject_Add(libparodus
    DEPENDS trower-base64 msgpack nanomsg wrp-c
    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/libparodus
    GIT_REPOSITORY https://github.com/Comcast/libparodus.git
-    GIT_TAG "a7615d69bd5859e337f467fb7e33182da970a5de"
+    GIT_TAG "master"
    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_TESTING=OFF
    		  -DMAIN_PROJ_BUILD=ON
    		  -DMAIN_PROJ_LIB_PATH=${LIBRARY_DIR}
@@ -187,7 +187,6 @@ 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 "470f8d5e9457755028aae6da65d3df9b62a53942"
    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_TESTING=OFF
    	          -DMAIN_PROJ_BUILD=ON
    	          -DMAIN_PROJ_LIB_PATH=${LIBRARY_DIR}
@@ -206,7 +205,8 @@ endif (ENABLE_SESHAT)
 ExternalProject_Add(cjwt
    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/cjwt
    GIT_REPOSITORY https://github.com/Comcast/cjwt.git
-    GIT_TAG "ddd077f0f00407f9657934492b252ee5cfcde535"
+    GIT_TAG "master"
+    #GIT_TAG "abd4376ff56212d16f69e850a64f6e095857ca39"
    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_TESTING=OFF
 )
 add_library(libcjwt STATIC SHARED IMPORTED)
@@ -218,7 +218,7 @@ if (FEATURE_DNS_QUERY)
 ExternalProject_Add(ucresolv
    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/ucresolv
    GIT_REPOSITORY https://github.com/Comcast/libucresolv.git
-    GIT_TAG "b58d49e165208791f84b44e3c079b1b4ef6d5c9d"
+    GIT_TAG "master"
    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
 )
 add_library(libucresolv STATIC SHARED IMPORTED)
@@ -235,7 +235,7 @@ if (BUILD_TESTING)
 ExternalProject_Add(cmocka
    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/cmocka
    GIT_REPOSITORY https://github.com/elventear/cmocka.git
-    GIT_TAG "b71a3060699bc1a5b00e958be353772f42545ac2"
+    GIT_TAG "master"
    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
 )
 add_library(libcmocka STATIC SHARED IMPORTED)
--- 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

 ```
@@ -55,12 +50,10 @@ make test

 - /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-read-script -Script to get webpa 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 
@@ -82,17 +75,17 @@ make test
 ```
 # Seshat & FEATURE_DNS_QUERY Enabled

-./parodus --hw-model=TGXXX --hw-serial-number=E8GBUEXXXXXXXXX --hw-manufacturer=ARRIS --hw-mac=14cfexxxxxxx --hw-last-reboot-reason=unknown --fw-name=TG1682_DEV_master_20170512115046sdy --boot-time=1494590301 --webpa-ping-timeout=180 --webpa-interface-used=eth0 --webpa-url=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
+./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


 # 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
+./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


 # 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
+./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

 ```

--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,11 +11,10 @@
 #   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
+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 token.c 
-	crud_interface.c crud_tasks.c crud_internal.c close_retry.c)
+    upstream.c downstream.c thread_tasks.c partners_check.c token.c)

 if (ENABLE_SESHAT)
 set(SOURCES ${SOURCES} seshat_interface.c)
--- a/src/ParodusInternal.c
+++ b/src/ParodusInternal.c
@@ -125,17 +125,3 @@ char* getWebpaConveyHeader()

    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;
-}
--- a/src/ParodusInternal.h
+++ b/src/ParodusInternal.h
@@ -59,12 +59,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                              */
 /*----------------------------------------------------------------------------*/
@@ -83,55 +77,10 @@ typedef struct {
 	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 max_delay;
-  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 LastReasonStatus;
 extern ParodusMsg *ParodusMsgQ;
 int numLoops;
 /*----------------------------------------------------------------------------*/
@@ -148,12 +97,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
@@ -224,31 +224,3 @@ int deleteFromList(char* service_name)
 	ParodusError("Could not find the entry to delete from list\n");
 	return -1;
 }
-
-/*
-*@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);
-			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;
-	}
-	return 0;
-}
--- a/src/client_list.h
+++ b/src/client_list.h
@@ -50,7 +50,6 @@ int sendAuthStatus(reg_list_item_t *new_node);

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

 reg_list_item_t * get_global_node(void);

--- 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
@@ -51,16 +51,7 @@ void set_parodus_cfg(ParodusCfg *cfg)
    memcpy(&parodusCfg, cfg, sizeof(ParodusCfg));
 }

-void set_cloud_disconnect_reason(ParodusCfg *cfg, char *disconn_reason)
-{
-    cfg->cloud_disconnect = strdup(disconn_reason);
-}
-
-void reset_cloud_disconnect_reason(ParodusCfg *cfg)
-{
-	cfg->cloud_disconnect = NULL;
-}
-
+static void execute_token_script(char *token, char *name, size_t len, char *mac, char *serNum);

 const char *get_tok (const char *src, int delim, char *result, int resultsize)
 {
@@ -141,7 +132,7 @@ void read_key_from_file (const char *fname, char *buf, size_t buflen)
  ParodusInfo ("%d bytes read\n", nbytes);
 }

-void execute_token_script(char *token, char *name, size_t len, char *mac, char *serNum)
+static 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'};
@@ -210,7 +201,7 @@ int server_is_http (const char *full_url,
 }
 	
 	
-int parse_webpa_url__ (const char *full_url, 
+int parse_webpa_url(const char *full_url, 
 	char *server_addr, int server_addr_buflen,
 	char *port_buf, int port_buflen)
 {
@@ -219,9 +210,6 @@ int parse_webpa_url__ (const char *full_url,
 	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);
@@ -234,40 +222,6 @@ int parse_webpa_url__ (const char *full_url,
 	// 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, ':');

@@ -276,11 +230,6 @@ int parse_webpa_url__ (const char *full_url,
 			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++;
@@ -289,7 +238,6 @@ int parse_webpa_url__ (const char *full_url,
 			*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;
@@ -317,49 +265,6 @@ unsigned int parse_num_arg (const char *arg, const char *arg_name)
 	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[] = {
@@ -389,7 +294,6 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
        {"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;
@@ -404,16 +308,13 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
 	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)
    {

      /* 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",
+      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",
 				long_options, &option_index);

      /* Detect the end of the options. */
@@ -559,11 +460,6 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
          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;
@@ -694,10 +590,7 @@ void setDefaultValuesToCfg(ParodusCfg *cfg)
    
    parStrncpy(cfg->webpa_uuid, "1234567-345456546",sizeof(cfg->webpa_uuid));
    ParodusPrint("cfg->webpa_uuid is :%s\n", cfg->webpa_uuid);
-    cfg->crud_config_file = strdup("parodus_cfg.json");
-	ParodusPrint("Default crud_config_file is %s\n", cfg->crud_config_file);
-	cfg->cloud_status = CLOUD_STATUS_OFFLINE;
-	ParodusInfo("Default cloud_status is %s\n", cfg->cloud_status);
+    
 }

 void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg)
@@ -862,14 +755,6 @@ void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg)
    parStrncpy(cfg->webpa_uuid, "1234567-345456546",sizeof(cfg->webpa_uuid));
    ParodusPrint("cfg->webpa_uuid is :%s\n", cfg->webpa_uuid);
    
-    if(config->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
@@ -49,11 +49,6 @@ extern "C" {
 #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 PROTOCOL_VALUE 					"PARODUS-2.0"
@@ -99,15 +94,11 @@ typedef struct
    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;
+    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                            */
@@ -133,22 +124,22 @@ void getAuthToken(ParodusCfg *cfg);
 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
+ * @param full_url		full url
+ * @param server_addr	 buffer containing server address found in url
+ * @param server_addr_buflen len of the server addr buffer provided by caller
+ * @param port_buf 		buffer containing port value found in url
+ * @param port_buflen	len of the port buffer provided by caller
 * @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);
+int parse_webpa_url(const char *full_url, 
+	char *server_addr, int server_addr_buflen,
+	char *port_buf, int port_buflen);

 #ifdef __cplusplus
 }
--- a/src/conn_interface.c
+++ b/src/conn_interface.c
@@ -33,41 +33,39 @@
 #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>

 /*----------------------------------------------------------------------------*/
 /*                                   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 close_retry = false;
+bool LastReasonStatus = false;
+volatile unsigned int heartBeatTimer = 0;
+pthread_mutex_t close_mut=PTHREAD_MUTEX_INITIALIZER;
+
 /*----------------------------------------------------------------------------*/
 /*                             Function Prototypes                            */
 /*----------------------------------------------------------------------------*/
-void timespec_diff(struct timespec *start, struct timespec *stop,
-                   struct timespec *result);
+
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/

 void createSocketConnection(void (* initKeypress)())
 {
+    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;
    
    //loadParodusCfg(tmpCfg,get_parodus_cfg());
 #ifdef FEATURE_DNS_QUERY
@@ -85,11 +83,7 @@ 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;
@@ -98,7 +92,6 @@ void createSocketConnection(void (* initKeypress)())
    ParodusMsgQ = NULL;
    StartThread(messageHandlerTask);
    StartThread(serviceAliveTask);
-	StartThread(CRUDHandlerTask);

    if (NULL != initKeypress) 
    {
@@ -109,66 +102,46 @@ void createSocketConnection(void (* initKeypress)())
    
    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);
+                ParodusError("ping wait time > %d. Terminating the connection with WebPA server and retrying\n", get_parodus_cfg()->webpa_ping_timeout);
                ParodusInfo("Reconnect detected, setting Ping_Miss reason for Reconnect\n");
                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);
+        else if(intTimer >= 30)
+        {
+            ParodusPrint("heartBeatTimer %d\n",heartBeatTimer);
+            heartBeatTimer += HEARTBEAT_RETRY_SEC;	
+            intTimer = 0;		
        }

        if( false == seshat_registered ) {
            seshat_registered = __registerWithSeshat();
        }

-        if(get_close_retry())
+        if(close_retry)
        {
-            ParodusInfo("close_retry is %d, hence closing the connection and retrying\n", get_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());
+        }		
+    } while(!close_retry);

    close_and_unref_connection(get_global_conn());
    nopoll_ctx_unref(ctx);
--- a/src/connection.c
+++ b/src/connection.c
@@ -28,25 +28,21 @@
 #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
-
 /*----------------------------------------------------------------------------*/
 /*                            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 noPollConnOpts * createConnOpts (char * extra_headers, bool secure);
+static noPollConn * nopoll_tls_common_conn (noPollCtx  * ctx,char * serverAddr,char *serverPort,char * extra_headers);
 static char* build_extra_headers( const char *auth, const char *device_id,
                                  const char *user_agent, const char *convey );

@@ -73,501 +69,230 @@ 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_delay)
-{
-  timer->max_delay = max_delay;
-  timer->delay = 1;
-}
-
-int update_backoff_delay (backoff_timer_t *timer)
-{
-  if (timer->delay < timer->max_delay)
-    timer->delay = timer->delay + timer->delay + 1;
-    // 3,7,15,31 ..
-  if (timer->delay > timer->max_delay)
-    timer->delay = timer->max_delay;
-  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) {
-     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
-
-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)) 
-     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;
-  }
-  if (NULL != redirectURL) {
-    free (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, 
-	int max_retry_sleep,
-	int query_dns_status)
-{
-    backoff_timer_t backoff_timer;
-    int rtn;
-    
-    init_backoff_timer (&backoff_timer, max_retry_sleep);
-
-    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)
-        if (query_dns_status < 0)
-          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_sleep;
-  int query_dns_status;
-  
-  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'};
+    int status=0;
+	int allow_insecure;
+    int connErr=0;
+    struct timespec connErr_start,connErr_end,*connErr_startPtr,*connErr_endPtr;
+    connErr_startPtr = &connErr_start;
+    connErr_endPtr = &connErr_end;
+    //Retry Backoff count shall start at c=2 & calculate 2^c - 1.
+	int c=2;
+    char *conveyHeader = NULL;
+    char device_id[32]={'\0'};
+    char user_agent[512]={'\0'};
+    char * extra_headers = NULL;
+    
+    if(ctx == NULL) {
        return nopoll_false;
-  }
+    }

 	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);
+	allow_insecure = parse_webpa_url (get_parodus_cfg()->webpa_url,
+		server_Address, (int) sizeof(server_Address),
+		port, (int) sizeof(port));
+	if (allow_insecure < 0)
+		return nopoll_false;	// must have valid default url
+#ifdef FEATURE_DNS_QUERY
+	if (get_parodus_cfg()->acquire_jwt) {
+		//query dns and validate JWT
+		int jwt_insecure = allow_insecure_conn(
+			server_Address, (int) sizeof(server_Address),
+			port, (int) sizeof(port));
+		if (jwt_insecure >= 0)
+			allow_insecure = jwt_insecure;
+	}
+#endif
+	ParodusInfo("server_Address %s\n",server_Address);
+	ParodusInfo("port %s\n", port);
 	
 	max_retry_sleep = (int) get_parodus_cfg()->webpa_backoff_max;
 	ParodusPrint("max_retry_sleep is %d\n", max_retry_sleep );
-  
-	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);
-  
-	while (true)
+	
+    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 = build_extra_headers( 
+    ((0 < strlen(get_parodus_cfg()->webpa_auth_token)) ? get_parodus_cfg()->webpa_auth_token : NULL), 
+    device_id, user_agent, conveyHeader );	     
+	
+	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, max_retry_sleep, query_dns_status))
-		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(allow_insecure <= 0)
+		{                    
+		    ParodusPrint("secure true\n");
+            connection = nopoll_tls_common_conn(ctx,server_Address, port, extra_headers);                
+		}
+		else 
+		{
+		    ParodusPrint("secure false\n");
+            noPollConnOpts * opts;
+            opts = createConnOpts(extra_headers, false);
+            connection = nopoll_conn_new_opts (ctx, opts,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
+				allow_insecure = parse_webpa_url (get_parodus_cfg()->webpa_url,
+					server_Address, (int) sizeof(server_Address),
+					port, (int) sizeof(port));
+				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, &status, redirectURL)) 
+			{
+				
+				if(status == 307 || status == 302 || 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;
+					allow_insecure = parse_webpa_url (redirect_ptr,
+						server_Address, (int) sizeof(server_Address),
+						port, (int) sizeof(port));
+					if (allow_insecure < 0) {
+						ParodusError ("Invalid redirectURL\n");
+						allow_insecure = parse_webpa_url (get_parodus_cfg()->webpa_url,
+							server_Address, (int) sizeof(server_Address),
+							port, (int) sizeof(port));
+					} else
+						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 if(status == 403) 
+				{
+					ParodusError("Received Unauthorized response with status: %d\n", status);
+					//Get new token and update auth header
+
+					if (strlen(get_parodus_cfg()->token_acquisition_script) >0) {
+						createNewAuthToken(get_parodus_cfg()->webpa_auth_token,sizeof(get_parodus_cfg()->webpa_auth_token));
+					}
+
+					extra_headers = build_extra_headers( (0 < strlen(get_parodus_cfg()->webpa_auth_token) ? get_parodus_cfg()->webpa_auth_token : NULL),
+														device_id, user_agent, conveyHeader );
+					
+					//reset c=2 to start backoffRetryTime as retrying 
+					c = 2;
+				}
+				else
+				{
+					ParodusError("Client connection timeout\n");	
+					ParodusError("RDK-10037 - WebPA Connection Lost\n");
+					// Copy the server address and port from config to avoid retrying to the same failing talaria redirected node
+					allow_insecure = parse_webpa_url (get_parodus_cfg()->webpa_url,
+						server_Address, (int) sizeof(server_Address),
+						port, (int) sizeof(port));
+					ParodusInfo("Waiting with backoffRetryTime %d seconds\n", backoffRetryTime);
+					sleep(backoffRetryTime);
+					c++;
+				}
+				//reset httpStatus before next retry
+				ParodusPrint("reset httpStatus from server before next retry\n");
+				status = 0;
+				close_and_unref_connection(get_global_conn());
+				set_global_conn(NULL);
+				initial_retry = true;
+				
+			}
+			else 
+			{
+				initial_retry = false;				
+				ParodusInfo("Connection is ready\n");
+			}
+		}
+		else
+		{
+			
+			/* If the connect error is due to DNS resolving to 10.0.0.1 then start timer.
+			 * Timeout after 15 minutes if the error repeats continuously and kill itself. 
+			 */
+			if((checkHostIp(server_Address) == -2)) 	
+			{
+				if(connErr == 0)
+				{
+					getCurrentTime(connErr_startPtr);
+					connErr = 1;
+					ParodusInfo("First connect error occurred, initialized the connect error timer\n");
+				}
+				else
+				{
+					getCurrentTime(connErr_endPtr);
+					ParodusPrint("checking timeout difference:%ld\n", timeValDiff(connErr_startPtr, connErr_endPtr));
+					if(timeValDiff(connErr_startPtr, connErr_endPtr) >= (15*60*1000))
+					{
+						ParodusError("WebPA unable to connect due to DNS resolving to 10.0.0.1 for over 15 minutes; crashing service.\n");
+						reconnect_reason = "Dns_Res_webpa_reconnect";
+						LastReasonStatus = true;
+						
+						kill(getpid(),SIGTERM);						
+					}
+				}			
+			}
+			initial_retry = true;
+			ParodusInfo("Waiting with backoffRetryTime %d seconds\n", backoffRetryTime);
+			sleep(backoffRetryTime);
+			c++;
+			// Copy the server address and port from config to avoid retrying to the same failing talaria redirected node
+			allow_insecure = parse_webpa_url (get_parodus_cfg()->webpa_url,
+				server_Address, (int) sizeof(server_Address),
+				port, (int) sizeof(port));
+		}
+				
+	}while(initial_retry);
+	
+	if(allow_insecure <= 0)
 	{
 		ParodusInfo("Connected to server over SSL\n");
 	}
@@ -576,24 +301,22 @@ 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);
-
-	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
+	connErr = 0;
+	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,
@@ -614,6 +337,33 @@ static char* build_extra_headers( const char *auth, const char *device_id,
            (NULL != convey) ? convey : "" );
 }

+static noPollConn * nopoll_tls_common_conn (noPollCtx  * ctx,char * serverAddr,char *serverPort,char * extra_headers)
+{
+        unsigned int flags = 0;
+        noPollConnOpts * opts;
+        noPollConn *connection = NULL;
+        opts = createConnOpts(extra_headers, true);
+
+        flags = get_parodus_cfg()->flags;
+
+        if( FLAGS_IPV4_ONLY == (FLAGS_IPV4_ONLY & flags) ) {
+            ParodusInfo("Connecting in Ipv4 mode\n");
+            connection = nopoll_conn_tls_new (ctx, opts,serverAddr,serverPort,NULL,get_parodus_cfg()->webpa_path_url,NULL,NULL);
+        } else if( FLAGS_IPV6_ONLY == (FLAGS_IPV6_ONLY & flags) ) {
+            ParodusInfo("Connecting in Ipv6 mode\n");
+            connection = nopoll_conn_tls_new6 (ctx, opts,serverAddr,serverPort,NULL,get_parodus_cfg()->webpa_path_url,NULL,NULL);
+        } else {
+            ParodusInfo("Try connecting with Ipv6 mode\n");
+            connection = nopoll_conn_tls_new6 (ctx, opts,serverAddr,serverPort,NULL,get_parodus_cfg()->webpa_path_url,NULL,NULL);
+            if(connection == NULL)
+            {
+                ParodusInfo("Ipv6 connection failed. Try connecting with Ipv4 mode \n");
+                opts = createConnOpts(extra_headers, true);
+                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)
 {
--- a/src/connection.h
+++ b/src/connection.h
@@ -34,6 +34,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 +55,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,173 +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                             */
-/*----------------------------------------------------------------------------*/
-
-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
-		{
-			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,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 crud_interface.h
- *
- * @description This header defines functions required to manage CRUD messages.
- *
- */
- 
-#ifndef _CRUD_INTERFACE_H_
-#define _CRUD_INTERFACE_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);
-
-#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
@@ -26,7 +26,6 @@
 #include "connection.h"
 #include "partners_check.h"
 #include "ParodusInternal.h"
-#include "crud_interface.h"

 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
@@ -94,32 +93,16 @@ void listenerOnMessage(void * msg, size_t msgSize)
                        cJSON_AddStringToObject(response, "message", "Invalid partner_id");
                    } 

-                      
-                    destVal = strdup(((WRP_MSG_TYPE__EVENT == msgType) ? message->u.event.dest : 
-                              ((WRP_MSG_TYPE__REQ   == msgType) ? message->u.req.dest : message->u.crud.dest)));
-
+                    destVal = ((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));
-						}
+                        strtok(destVal , "/");
+                        parStrncpy(dest,strtok(NULL , "/"), 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();
+                        temp = get_global_node();
                        //Checking for individual clients & Sending to each client

                        while (NULL != temp)
@@ -139,25 +122,7 @@ void listenerOnMessage(void * msg, size_t msgSize)
                            temp= temp->next;
                        }

-						/* 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
-							{
-								addCRUDmsgToQueue(message);
-							}
-							destFlag =1;
-						}
-						//if any unknown dest received sending error response to server
+                        //if any unknown dest received sending error response to server
                        if(destFlag ==0)
                        {
                            ParodusError("Unknown dest:%s\n", dest);
@@ -182,15 +147,8 @@ void listenerOnMessage(void * msg, size_t msgSize)
                        }
                        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.source =           message->u.crud.dest;
+                            resp_msg ->u.crud.dest =             message->u.crud.source;
                            resp_msg ->u.crud.transaction_uuid = message->u.crud.transaction_uuid;
                            resp_msg ->u.crud.path =             message->u.crud.path;
                        }
@@ -234,7 +192,6 @@ void listenerOnMessage(void * msg, size_t msgSize)
                case WRP_MSG_TYPE__SVC_ALIVE:
                case WRP_MSG_TYPE__UNKNOWN:
                default:
-                        wrp_free_struct(message);
                    break;
            }
        }
--- 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/nopoll_handlers.c
+++ b/src/nopoll_handlers.c
@@ -24,8 +24,6 @@
 #include "ParodusInternal.h"
 #include "nopoll_handlers.h"
 #include "connection.h"
-#include "heartBeat.h"
-#include "close_retry.h"

 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */
@@ -38,7 +36,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 +54,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 +94,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 +109,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 +118,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 +129,24 @@ 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);
+    	ParodusInfo("Reconnect detected, setting Reconnect reason as Server close\n");
+        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
@@ -36,6 +36,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
@@ -25,7 +25,6 @@
 #include "connection.h"
 #include "nopoll_helpers.h"
 #include "nopoll_handlers.h"
-#include "time.h"

 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */
@@ -34,10 +33,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 +49,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 +60,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");
    }
 }

--- a/src/token.c
+++ b/src/token.c
@@ -111,7 +111,8 @@ static void show_times (time_t exp_time, time_t cur_time)
 }

 // returns 1 if insecure, 0 if secure, < 0 if error
-int analyze_jwt (const cjwt_t *jwt, char **url_buf, unsigned int *port)
+int analyze_jwt (const cjwt_t *jwt, char *url_buf, int url_buflen,
+	char *port_buf, int port_buflen)
 {
 	cJSON *claims = jwt->private_claims;
 	cJSON *endpoint = NULL;
@@ -143,7 +144,7 @@ int analyze_jwt (const cjwt_t *jwt, char **url_buf, unsigned int *port)
 		}
 	}
 	http_match = parse_webpa_url (endpoint->valuestring,
-		url_buf, port);
+		url_buf, url_buflen, port_buf, port_buflen);
 	if (http_match < 0) {
 		ParodusError ("Invalid endpoint claim in JWT\n");
 		return TOKEN_ERR_BAD_ENDPOINT;
@@ -184,7 +185,7 @@ int nquery(const char* dns_txt_record_id, u_char *nsbuf)
 			ParodusError ("nquery: nsbuf is NULL\n");
 			return (-1);
 		}
-		statp.options = RES_DEBUG;
+		statp.options |= RES_DEBUG;
    if (__res_ninit(&statp) < 0) {
        ParodusError ("res_ninit error: can't initialize statp.\n");
        return (-1);
@@ -232,10 +233,11 @@ static bool is_digit (char c)
 // strip quotes and newlines from rr rec
 const char *strip_rr_data (const char *rr_ptr, int *rrlen)
 {
-	int len = *rrlen;
+	int len;
 	const char *optr = rr_ptr;
 	char c;

+	len = strlen (optr);
 	if (len > 0) {
 		c = optr[0];
 		if (!is_digit(c)) {
@@ -336,7 +338,6 @@ int get_rr_seq_table (ns_msg *msg_handle, int num_rr_recs, rr_rec_t *seq_table)
    	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);
@@ -428,10 +429,8 @@ int query_dns(const char* dns_txt_record_id,char *jwt_ans)
 		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;
 	}
@@ -473,7 +472,8 @@ static void get_dns_txt_record_id (char *buf)
 }
 #endif

-int allow_insecure_conn(char **server_addr, unsigned int *port)
+int allow_insecure_conn(char *url_buf, int url_buflen,
+	char *port_buf, int port_buflen)
 {
 #ifdef FEATURE_DNS_QUERY	
 	int insecure=0, ret = -1;
@@ -491,18 +491,15 @@ int allow_insecure_conn(char **server_addr, unsigned int *port)
 	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){
+		if (ret == TOKEN_ERR_MEMORY_FAIL) {
 			insecure = ret;
-		} 
-		else{
+		} 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) );
@@ -521,7 +518,7 @@ int allow_insecure_conn(char **server_addr, unsigned int *port)

 	//validate algo from --jwt_algo
 	if( validate_algo(jwt) ) {
-		insecure = analyze_jwt (jwt, server_addr, port);
+		insecure = analyze_jwt (jwt, url_buf, url_buflen, port_buf, port_buflen);
 	} else {
 		insecure = TOKEN_ERR_ALGO_NOT_ALLOWED;
 	}
@@ -535,8 +532,10 @@ end:
 	if (NULL != jwt_token)
 		free (jwt_token);
 #else
-  (void) server_addr;
-  (void) port;
+  (void) url_buf;
+  (void) url_buflen;
+  (void) port_buf;
+  (void) port_buflen;
  int insecure = TOKEN_NO_DNS_QUERY;
 #endif
 	ParodusPrint ("Allow Insecure %d\n", insecure);
--- a/src/token.h
+++ b/src/token.h
@@ -78,13 +78,15 @@ 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
+ * @param url_buf		buffer containing endpoint value found in JWT
+ * @param url_buflen	len of the url buffer provided by caller
+ * @param port_buf 		buffer containing port value found in JWT
+ * @param port_buflen	len of the port buffer provided by caller
 * @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);
+int allow_insecure_conn(char *url_buf, int url_buflen,
+	char *port_buf, int port_buflen);


 #endif
--- a/src/upstream.c
+++ b/src/upstream.c
@@ -28,13 +28,12 @@
 #include "connection.h"
 #include "client_list.h"
 #include "nopoll_helpers.h"
-#include "close_retry.h"

 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */
 /*----------------------------------------------------------------------------*/
 #define METADATA_COUNT 					12
-#define CLOUD_STATUS_FORMAT				"parodus/cloud-status"
+
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
@@ -49,26 +48,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                             */
 /*----------------------------------------------------------------------------*/
@@ -192,15 +171,11 @@ void *processUpstreamMessage()
 {		
    int rv=-1, rc = -1;	
    int msgType;
-    wrp_msg_t *msg,*retrieve_msg = NULL;
+    wrp_msg_t *msg;	
    void *bytes;
    reg_list_item_t *temp = NULL;
    int matchFlag = 0;
    int status = -1;
-    char *serviceName = NULL;
-    char *destService, *destApplication =NULL;
-    char *sourceService, *sourceApplication =NULL;
-    int sendStatus =-1;

    while(FOREVER())
    {
@@ -324,120 +299,31 @@ void *processUpstreamMessage()
                }
                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 && msg->u.crud.dest !=NULL && msg->u.crud.source != NULL)
-						{
-							destService = wrp_get_msg_element(WRP_ID_ELEMENT__SERVICE, msg, DEST);
-							destApplication = wrp_get_msg_element(WRP_ID_ELEMENT__APPLICATION, msg, DEST);
-							sourceService = wrp_get_msg_element(WRP_ID_ELEMENT__SERVICE, msg, SOURCE);
-							sourceApplication = wrp_get_msg_element(WRP_ID_ELEMENT__APPLICATION, msg, SOURCE);
-							/*  Handle cloud-status retrieve request here
-								Expecting dest format as mac:xxxxxxxxxxxx/parodus/cloud-status
-								Parse dest field and check destService is "parodus" and destApplication is "cloud-status"
-							*/
-							if(destService != NULL && destApplication != NULL && strcmp(destService,"parodus")== 0 && strcmp(destApplication,"cloud-status")== 0)
-							{
-								retrieve_msg = ( wrp_msg_t *)malloc( sizeof( wrp_msg_t ) );
-								memset(retrieve_msg, 0, sizeof(wrp_msg_t));
-								retrieve_msg->msg_type = msg->msg_type;
-								retrieve_msg->u.crud.transaction_uuid = strdup(msg->u.crud.transaction_uuid);
-								retrieve_msg->u.crud.source = strdup(msg->u.crud.source);
-								retrieve_msg->u.crud.dest = strdup(msg->u.crud.dest);
-								addCRUDmsgToQueue(retrieve_msg);
-							}
-							else if(sourceService != NULL && sourceApplication != NULL && strcmp(sourceService,"parodus")== 0 && strcmp(sourceApplication,"cloud-status")== 0 && strncmp(msg->u.crud.dest,"mac:", 4)==0)
-							{
-								/*  Handle cloud-status retrieve response here to send it to registered client
-									Expecting src format as mac:xxxxxxxxxxxx/parodus/cloud-status and dest as mac:
-									Parse src field and check sourceService is "parodus" and sourceApplication is "cloud-status"
-								*/
-								serviceName = wrp_get_msg_element(WRP_ID_ELEMENT__SERVICE, msg, DEST);
-								if ( serviceName != NULL)
-								{
-									//Send Client cloud-status response back to registered client
-									ParodusInfo("Sending cloud-status response to %s client\n",serviceName);
-									sendStatus=sendMsgtoRegisteredClients(serviceName,(const char **)&message->msg,message->len);
-									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 cloud-status response to client\n");
-								}
-							}
-							else
-							{
-								ParodusInfo("sendUpstreamMsgToServer \n");
-								sendUpstreamMsgToServer(&message->msg, message->len);
-							}
-							if(sourceService !=NULL)
-							{
-								free(sourceService);
-								sourceService = NULL;
-							}
-							if(sourceApplication !=NULL)
-							{
-								free(sourceApplication);
-								sourceApplication = NULL;
-							}
-							if(destService !=NULL)
-							{
-								free(destService);
-								destService = NULL;
-							}
-							if(destApplication !=NULL)
-							{
-								free(destApplication);
-								destApplication = NULL;
-							}
-						}
-						else
-						{
-							sendUpstreamMsgToServer(&message->msg, message->len);
-						}
-					}
-            	}
-           	}
+                    //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 );
+                    } 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 );
+                    }
+                    sendUpstreamMsgToServer(&message->msg, message->len);
+                }
+            }
            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
        {
@@ -454,7 +340,7 @@ 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)
 	{
@@ -463,18 +349,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
@@ -24,12 +24,10 @@
 #ifndef _UPSTREAM_H_
 #define _UPSTREAM_H_

-#include <pthread.h>
-#include <wrp-c.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
-	
+
 /*----------------------------------------------------------------------------*/
 /*                               Data Structures                              */
 /*----------------------------------------------------------------------------*/
@@ -49,10 +47,6 @@ void *handle_upstream();
 void *processUpstreamMessage();

 void sendUpstreamMsgToServer(void **resp_bytes, size_t resp_size);
-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
@@ -36,20 +36,6 @@ endif ()

 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
 #-------------------------------------------------------------------------------
@@ -123,37 +109,29 @@ 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_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_executable(test_connection test_connection.c ../src/connection.c ${PARODUS_COMMON_SRC}) 
+#target_link_libraries (test_connection ${PARODUS_COMMON_LIBS} -lcmocka)
+set(SOURCES test_connection.c ../src/connection.c ${PARODUS_COMMON_SRC})
+add_executable(test_connection ${SOURCES})
+#target_link_libraries (test_connection ${PARODUS_CONN_LIBS} ${PARODUS_COMMON_LIBS} -lcmocka)
 target_link_libraries (test_connection ${PARODUS_COMMON_LIBS} -lcmocka)

 #-------------------------------------------------------------------------------
 #   test_connection - function createNopollConnection
 #-------------------------------------------------------------------------------
-#add_test(NAME test_createConnection COMMAND ${MEMORY_CHECK} ./test_createConnection)
+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) 
+add_executable(test_createConnection test_createConnection.c ../src/connection.c ../src/string_helpers.c ../src/config.c) 
 #target_link_libraries (test_createConnection ${PARODUS_CONN_LIBS} ${PARODUS_COMMON_LIBS} -lcmocka )
-#target_link_libraries (test_createConnection ${PARODUS_COMMON_LIBS} -lcmocka )
+target_link_libraries (test_createConnection ${PARODUS_COMMON_LIBS} -lcmocka )

 #-------------------------------------------------------------------------------
 #   test_client_list
@@ -161,19 +139,19 @@ target_link_libraries (test_connection ${PARODUS_COMMON_LIBS} -lcmocka)
 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 
+set(SOURCES 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/downstream.c ../src/connection.c ../src/nopoll_handlers.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})
+ ../src/partners_check.c ${PARODUS_COMMON_SRC})

 if (ENABLE_SESHAT)
-set(CLIST_SRC ${CLIST_SRC} ../src/seshat_interface.c)
+set(SOURCES ${SOURCES} ../src/seshat_interface.c)
 else()
-set(CLIST_SRC ${CLIST_SRC} ../src/seshat_interface_stub.c)
+set(SOURCES ${SOURCES} ../src/seshat_interface_stub.c)
 endif (ENABLE_SESHAT)
 
-add_executable(test_client_list ${CLIST_SRC})
+add_executable(test_client_list ${SOURCES})
 #target_link_libraries (test_client_list ${PARODUS_CONN_LIBS} ${PARODUS_COMMON_LIBS})
 target_link_libraries (test_client_list ${PARODUS_COMMON_LIBS})

@@ -183,14 +161,14 @@ target_link_libraries (test_client_list ${PARODUS_COMMON_LIBS})
 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})
+set(SOURCES 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})
 if (ENABLE_SESHAT)
-set(SVA_SRC ${SVA_SRC} ../src/seshat_interface.c)
+set(SOURCES ${SOURCES} ../src/seshat_interface.c)
 else()
-set(SVA_SRC ${SVA_SRC} ../src/seshat_interface_stub.c)
+set(SOURCES ${SOURCES} ../src/seshat_interface_stub.c)
 endif (ENABLE_SESHAT)

-add_executable(test_service_alive ${SVA_SRC})
+add_executable(test_service_alive ${SOURCES})
 #target_link_libraries (test_service_alive ${PARODUS_CONN_LIBS} ${PARODUS_COMMON_LIBS})
 target_link_libraries (test_service_alive ${PARODUS_COMMON_LIBS})

@@ -204,32 +182,11 @@ target_link_libraries (test_config -lcmocka
 -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} )
-
 #-------------------------------------------------------------------------------
 #   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)
+add_executable(test_upstream test_upstream.c ../src/upstream.c ../src/string_helpers.c)
 target_link_libraries (test_upstream -lcmocka ${PARODUS_COMMON_LIBS} )

 #-------------------------------------------------------------------------------
@@ -257,22 +214,13 @@ 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
-)
+set(SOURCES test_conn_interface.c ../src/conn_interface.c ../src/config.c ../src/string_helpers.c ../src/mutex.c)
 if (ENABLE_SESHAT)
-set(CONIFC_SRC ${CONIFC_SRC} ../src/seshat_interface.c)
+set(SOURCES ${SOURCES} ../src/seshat_interface.c)
 else()
-set(CONIFC_SRC ${CONIFC_SRC} ../src/seshat_interface_stub.c)
+set(SOURCES ${SOURCES} ../src/seshat_interface_stub.c)
 endif (ENABLE_SESHAT)
-add_executable(test_conn_interface ${CONIFC_SRC})
+add_executable(test_conn_interface ${SOURCES})
 target_link_libraries (test_conn_interface -lcmocka ${PARODUS_COMMON_LIBS} )

 #-------------------------------------------------------------------------------
@@ -293,32 +241,7 @@ target_link_libraries (test_partners_check -lcmocka ${PARODUS_COMMON_LIBS} -lwrp
 #   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} ) 
+add_executable(test_token ${SOURCES} ) 
 #target_link_libraries (test_token ${PARODUS_COMMON_LIBS} ${PARODUS_JWT_LIBS} -lcmocka )
 target_link_libraries (test_token ${PARODUS_COMMON_LIBS} -lcmocka )

@@ -327,11 +250,11 @@ target_link_libraries (test_token ${PARODUS_COMMON_LIBS} -lcmocka )
 #-------------------------------------------------------------------------------
 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)
+set(SOURCES 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)
+set(SOURCES test_seshat_interface_stub.c ../src/seshat_interface_stub.c)
 endif (ENABLE_SESHAT)
-add_executable(test_seshat_interface ${SESHIFC_SRC})
+add_executable(test_seshat_interface ${SOURCES})
 target_link_libraries (test_seshat_interface -lcmocka ${PARODUS_COMMON_LIBS} -lwrp-c)

 if (INTEGRATION_TESTING)
@@ -339,28 +262,28 @@ 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
+set(SOURCES 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)
+set(SOURCES ${SOURCES} ../src/seshat_interface.c)
 else()
-set(SIMCON_SRC ${SIMCON_SRC} ../src/seshat_interface_stub.c)
+set(SOURCES ${SOURCES} ../src/seshat_interface_stub.c)
 endif (ENABLE_SESHAT)
-add_executable(simple_connection ${SIMCON_SRC}) 
+add_executable(simple_connection ${SOURCES}) 
 target_link_libraries (simple_connection ${PARODUS_CONN_LIBS} ${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
+set(SOURCES 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)
+set(SOURCES ${SOURCES} ../src/seshat_interface.c)
 else()
-set(SIMPLE_SRC ${SIMPLE_SRC} ../src/seshat_interface_stub.c)
+set(SOURCES ${SOURCES} ../src/seshat_interface_stub.c)
 endif (ENABLE_SESHAT)
-add_executable(simple ${SIMPLE_SRC}) 
+add_executable(simple ${SOURCES}) 

 target_link_libraries (simple ${PARODUS_CONN_LIBS} ${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
@@ -244,19 +244,13 @@ void delay_ms(unsigned int secs, unsigned int msecs)

 void dbg_log_err (const char *fmt, ...)
 {
-    char errbuf[100];
+		char errbuf[100];

    va_list arg_ptr;
-
    va_start(arg_ptr, fmt);
    vprintf(fmt, arg_ptr);
    va_end(arg_ptr);
-
-    if( 0 == strerror_r (errno, errbuf, 100) ) {   
-        printf("LIBPD_TEST: %s\n", errbuf);
-    } else {   
-        printf("LIBPD_TEST: strerror_r returned failure!\n");
-    }
+		printf ("LIBPD_TEST: %s\n", strerror_r (errno, errbuf, 100));
 }

 void wait_auth_received (void)
--- 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/test_ParodusInternal.c
+++ b/tests/test_ParodusInternal.c
@@ -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_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[3], NULL, test_mutex_reset_close_retry, NULL);
-	pthread_join(thread[3], 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
@@ -30,15 +30,11 @@
 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, 
+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);

 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
@@ -73,7 +69,7 @@ void test_setParodusConfig()
    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));
+    parStrncpy(cfg.partner_id , "comcast", sizeof(cfg.partner_id));
 #ifdef ENABLE_SESHAT
    parStrncpy(cfg.seshat_url, "ipc://tmp/seshat_service.url", sizeof(cfg.seshat_url));
 #endif
@@ -86,10 +82,10 @@ void test_setParodusConfig()
    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();
+#endif    
+    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);
@@ -115,7 +111,6 @@ void test_setParodusConfig()
    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()
@@ -189,11 +184,10 @@ void test_parseCommandLine()
 		"--ssl-cert-path=/etc/ssl/certs/ca-certificates.crt",
 #ifdef FEATURE_DNS_QUERY
 		"--acquire-jwt=1",
-		"--dns-txt-url=mydns.mycom.net",
+		"--dns-txt-url=fabric.comcast.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;
@@ -232,11 +226,11 @@ void test_parseCommandLine()
    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_string_equal(parodusCfg.dns_txt_url, "fabric.comcast.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()
@@ -278,7 +272,7 @@ void err_parseCommandLine()
 #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";
+	command[4] = "--dns-txt-url=fabric.comcast.net";
 	// missing algo
    assert_int_equal (parseCommandLine(argc,command,&parodusCfg), -1);
 	command[4] = "--jwt-algo=none:RS256";
@@ -313,7 +307,7 @@ void test_loadParodusCfg()
    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));
+    parStrncpy(Cfg->dns_txt_url, "fabric",sizeof(Cfg->dns_txt_url));
    Cfg->jwt_algo = 1025;
    parStrncpy(Cfg->jwt_key, "AGdyuwyhwl2ow2ydsoioiygkshwdthuwd",sizeof(Cfg->jwt_key));
 #endif
@@ -323,7 +317,6 @@ void test_loadParodusCfg()
 #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");
    memset(&tmpcfg,0,sizeof(ParodusCfg));
    loadParodusCfg(Cfg,&tmpcfg);

@@ -336,7 +329,7 @@ void test_loadParodusCfg()
    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_string_equal(tmpcfg.dns_txt_url, "fabric");
    assert_int_equal( (int) tmpcfg.jwt_algo, 1025);
    assert_string_equal(tmpcfg.jwt_key, "AGdyuwyhwl2ow2ydsoioiygkshwdthuwd");
 #endif
@@ -346,7 +339,6 @@ void test_loadParodusCfg()
 #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);
 }

@@ -367,7 +359,7 @@ void test_loadParodusCfgNull()
    assert_string_equal( temp.webpa_path_url, WEBPA_PATH_URL);	
    assert_string_equal( temp.webpa_uuid,"1234567-345456546");
    assert_string_equal( temp.local_url, PARODUS_UPSTREAM);
-	assert_null(temp.crud_config_file);
+
    free(cfg);
 }

@@ -417,7 +409,6 @@ void test_setDefaultValuesToCfg()
    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()
@@ -458,89 +449,31 @@ void test_server_is_http ()
 	
 }

-void test_parse_webpa_url__ ()
+void test_parse_webpa_url ()
 {
 	char addr_buf[80];
 	char port_buf[8];
-	assert_int_equal (parse_webpa_url__ ("mydns.mycom.net:8080",
+	assert_int_equal (parse_webpa_url ("fabric.webpa.comcast.net:8080",
 		addr_buf, 80, port_buf, 8), -1);
-	assert_int_equal (parse_webpa_url__ ("https://mydns.mycom.net:8080",
+	assert_int_equal (parse_webpa_url ("https://fabric.webpa.comcast.net:8080",
 		addr_buf, 80, port_buf, 8), 0);
-	assert_string_equal (addr_buf, "mydns.mycom.net");
+	assert_string_equal (addr_buf, "fabric.webpa.comcast.net");
 	assert_string_equal (port_buf, "8080");
-	assert_int_equal (parse_webpa_url__ ("https://mydns.mycom.net/",
+	assert_int_equal (parse_webpa_url ("https://fabric.webpa.comcast.net/",
 		addr_buf, 80, port_buf, 8), 0);
-	assert_string_equal (addr_buf, "mydns.mycom.net");
+	assert_string_equal (addr_buf, "fabric.webpa.comcast.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",
+	assert_int_equal (parse_webpa_url ("http://fabric.webpa.comcast.net:8080",
 		addr_buf, 80, port_buf, 8), 1);
-	assert_string_equal (addr_buf, "mydns.mycom.net");
+	assert_string_equal (addr_buf, "fabric.webpa.comcast.net");
 	assert_string_equal (port_buf, "8080");
-	assert_int_equal (parse_webpa_url__ ("http://mydns.mycom.net",
+	assert_int_equal (parse_webpa_url ("http://fabric.webpa.comcast.net",
 		addr_buf, 80, port_buf, 8), 1);
-	assert_string_equal (addr_buf, "mydns.mycom.net");
+	assert_string_equal (addr_buf, "fabric.webpa.comcast.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);
@@ -553,46 +486,6 @@ void test_get_algo_mask ()
 #endif	
 }

-void test_execute_token_script()
-{
-  char *cmd1 = "../../tests/return_ser_mac.bsh";
-  char *cmd2 = "nosuch";
-  char token[32];
-  
-  memset (token, '\0', sizeof(token));
-  execute_token_script (token, cmd1, sizeof(token), "mac123", "ser456");
-  assert_string_equal (token, "SER_MAC ser456 mac123");
-  
-  memset (token, '\0', sizeof(token));
-  execute_token_script (token, cmd2, sizeof(token), "mac123", "ser456");
-  assert_string_equal (token, "");
-}
-
-void test_new_auth_token ()
-{
-  char token[64];
-  ParodusCfg cfg;
-  memset(&cfg,0,sizeof(cfg));
-
-  parStrncpy (cfg.token_acquisition_script, "../../tests/return_success.bsh",
-	sizeof(cfg.token_acquisition_script));
-  parStrncpy (cfg.token_read_script, "../../tests/return_ser_mac.bsh",
-	sizeof(cfg.token_read_script));
-  parStrncpy(cfg.hw_serial_number, "Fer23u948590", sizeof(cfg.hw_serial_number));
-  parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
-	
-  set_parodus_cfg(&cfg);
-  createNewAuthToken (token, sizeof(token));
-  assert_string_equal (token, "SER_MAC Fer23u948590 123567892366");
-  
-  memset (token, 0, sizeof(token));
-  parStrncpy (cfg.token_acquisition_script, "../../tests/return_failure.bsh",
-	sizeof(cfg.token_acquisition_script));
-  set_parodus_cfg(&cfg);
-  createNewAuthToken (token, sizeof(token));
-  assert_string_equal (token, "");  
-	
-}

 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
@@ -610,16 +503,13 @@ int main(void)
        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_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,18 +27,15 @@
 #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 nano_mut;
-pthread_cond_t nano_con;
-
- 
+extern bool close_retry;
+extern pthread_mutex_t close_mut;
+extern volatile unsigned int heartBeatTimer;
 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/
@@ -76,17 +73,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()
 {
@@ -121,12 +107,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);
@@ -171,40 +151,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;
-}
-
-/*
-* 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;
-}
-
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/
@@ -214,7 +160,10 @@ void test_createSocketConnection()
    noPollCtx *ctx;
    ParodusCfg cfg;
    memset(&cfg,0,sizeof(ParodusCfg));
-    reset_close_retry();
+    
+    pthread_mutex_lock (&close_mut);
+    close_retry = false;
+    pthread_mutex_unlock (&close_mut);
    expect_function_call(nopoll_thread_handlers);
    
    will_return(nopoll_ctx_new, (intptr_t)&ctx);
@@ -224,14 +173,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);
@@ -250,7 +198,9 @@ void test_createSocketConnection1()
    noPollCtx *ctx;
    ParodusCfg cfg;
    memset(&cfg,0, sizeof(ParodusCfg));
-    set_close_retry();
+    pthread_mutex_lock (&close_mut);
+    close_retry = true;
+    pthread_mutex_unlock (&close_mut);
    expect_function_call(nopoll_thread_handlers);
    
    will_return(nopoll_ctx_new, (intptr_t)&ctx);
@@ -260,7 +210,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);
    
@@ -276,11 +226,10 @@ void test_createSocketConnection1()
    expect_function_call(nopoll_ctx_unref);
    expect_function_call(nopoll_cleanup_library);
    createSocketConnection(NULL);
-    assert_string_equal(get_parodus_cfg()->cloud_status, CLOUD_STATUS_OFFLINE);
    
 }

-void test_PingMissIntervalTime()
+void test_createSocketConnection2()
 {
    noPollCtx *ctx;
    ParodusCfg cfg;
@@ -296,11 +245,12 @@ void test_PingMissIntervalTime()
    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;
+    cfg.webpa_ping_timeout = 1;
    set_parodus_cfg(&cfg);
    
-    reset_close_retry();
+    pthread_mutex_lock (&close_mut);
+    close_retry = false;
+    pthread_mutex_unlock (&close_mut);
    expect_function_call(nopoll_thread_handlers);
    
    will_return(nopoll_ctx_new, (intptr_t)&ctx);
@@ -310,8 +260,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);
@@ -320,10 +269,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);
@@ -335,13 +283,14 @@ void test_PingMissIntervalTime()
    expect_function_call(nopoll_ctx_unref);
    expect_function_call(nopoll_cleanup_library);
    createSocketConnection(NULL);
-    
 }

 void err_createSocketConnection()
 {
-    set_close_retry();
-    reset_heartBeatTimer();
+    pthread_mutex_lock (&close_mut);
+    close_retry = true;
+    pthread_mutex_unlock (&close_mut);
+    heartBeatTimer = 0;
    expect_function_call(nopoll_thread_handlers);
    
    will_return(nopoll_ctx_new, (intptr_t)NULL);
@@ -351,7 +300,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);
    
@@ -369,53 +318,6 @@ void err_createSocketConnection()
    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);
-}
-
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
@@ -425,9 +327,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
@@ -22,173 +22,38 @@
 #include <setjmp.h>
 #include <cmocka.h>
 #include <assert.h>
-#include <CUnit/Basic.h>
 #include <nopoll.h>

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

-extern void set_server_null (server_t *server);
-extern void set_server_list_null (server_list_t *server_list);
-extern int server_is_null (server_t *server);
-extern server_t *get_current_server (server_list_t *server_list);
-extern int parse_server_url (const char *full_url, server_t *server);
-extern void init_expire_timer (expire_timer_t *timer);
-extern int check_timer_expired (expire_timer_t *timer, long timeout_ms);
-extern void init_backoff_timer (backoff_timer_t *timer, int max_delay);
-extern int update_backoff_delay (backoff_timer_t *timer);
-extern int init_header_info (header_info_t *header_info);
-extern void free_header_info (header_info_t *header_info);
-extern char *build_extra_hdrs (header_info_t *header_info);
-extern void set_current_server (create_connection_ctx_t *ctx);
-extern void set_extra_headers (create_connection_ctx_t *ctx, int reauthorize);
-extern void free_extra_headers (create_connection_ctx_t *ctx);
-extern void free_server_list (server_list_t *server_list);
-extern void free_server (server_t *server);
-extern int find_servers (server_list_t *server_list);
-extern int nopoll_connect (create_connection_ctx_t *ctx, int is_ipv6);
-extern int wait_connection_ready (create_connection_ctx_t *ctx);
-extern int connect_and_wait (create_connection_ctx_t *ctx);
-extern int keep_trying_to_connect (create_connection_ctx_t *ctx, 
-	int max_retry_sleep,
-	int query_dns_status);
-
-
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/

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

-// Mock values
-char *mock_server_addr;
-unsigned int mock_port;
-int mock_wait_status;
-char *mock_redirect;
-noPollConn connection1;
-noPollConn connection2;
-noPollConn connection3;
-
 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/
 char* getWebpaConveyHeader()
 {
-    return (char*) "WebPA-1.6 (TG1682)";
-}
-
-noPollConn * nopoll_conn_new_opts (noPollCtx  * ctx, noPollConnOpts  * opts, const char  * host_ip, const char  * host_port, const char  * host_name,const char  * get_url,const char  * protocols, const char * origin)
-{
-    UNUSED(host_port); UNUSED(host_name); UNUSED(get_url); UNUSED(protocols); 
-    UNUSED(origin); UNUSED(opts); UNUSED(ctx); UNUSED(host_ip);
-    
-    function_called();
-    //check_expected((intptr_t)ctx);
-    //check_expected((intptr_t)host_ip);
-    return (noPollConn *) (intptr_t)mock();
-}
-
-noPollConn * nopoll_conn_tls_new (noPollCtx  * ctx, noPollConnOpts * options, const char * host_ip, const char * host_port, const char * host_name, const char * get_url, const char * protocols, const char * origin)
-{
-    UNUSED(options); UNUSED(host_port); UNUSED(host_name); UNUSED(get_url); UNUSED(protocols); 
-    UNUSED(origin); UNUSED(ctx); UNUSED(host_ip);
-    
-    function_called();
-    //check_expected((intptr_t)ctx);
-    //check_expected((intptr_t)host_ip);
-    return (noPollConn *) (intptr_t)mock();
-}
-
-noPollConn * nopoll_conn_tls_new6 (noPollCtx  * ctx, noPollConnOpts * options, const char * host_ip, const char * host_port, const char * host_name, const char * get_url, const char * protocols, const char * origin)
-{
-    UNUSED(options); UNUSED(host_port); UNUSED(host_name); UNUSED(get_url); UNUSED(protocols); 
-    UNUSED(origin); UNUSED(ctx); UNUSED(host_ip);
-    
-    function_called();
-    //check_expected((intptr_t)ctx);
-    //check_expected((intptr_t)host_ip);
-    return (noPollConn *) (intptr_t)mock();
-}
-
-nopoll_bool  nopoll_conn_wait_for_status_until_connection_ready (noPollConn * conn,
-	int timeout, int *status, char ** message)
-{
-    UNUSED(conn); UNUSED(timeout);
-    *status = mock_wait_status;
-    if ((NULL != mock_redirect) &&
-        ((mock_wait_status == 307) || (mock_wait_status == 302) || 
-         (mock_wait_status == 303)) )
-    {
-      *message = malloc (strlen(mock_redirect) + 10);
-      sprintf (*message, "Redirect:%s", mock_redirect);
-    }
-    function_called();
-    return (nopoll_bool) mock();
-}
-
-nopoll_bool nopoll_conn_is_ok (noPollConn * conn)
-{
-    UNUSED(conn);
-    function_called ();
-    return (nopoll_bool) mock();
-}
-
-void nopoll_conn_close (noPollConn *conn)
-{
-    UNUSED(conn);
-}
-
-int nopoll_conn_ref_count (noPollConn *conn)
-{
-    UNUSED(conn);
-    function_called ();
-    return (nopoll_bool) mock();
+    return NULL;
 }

 int checkHostIp(char * serverIP)
 {
    UNUSED(serverIP);
-    function_called();
-    return (int) mock();
-}
-
-int kill(pid_t pid, int sig)
-{
-    UNUSED(pid); UNUSED(sig);
-    function_called();
-    return (int) mock();
+    return 0;
 }

 void setMessageHandlers()
 {
 }
-
-int allow_insecure_conn (char **server_addr, unsigned int *port)
-{
-  int rtn;
-	
-  function_called ();
-  rtn = (int) mock();
-  if (rtn < 0) {
-    *server_addr = NULL;
-    return rtn;
-  }
-  
-  if (NULL != mock_server_addr) {
-    size_t len = strlen(mock_server_addr) + 1;
-    *server_addr = malloc (len);
-    if (NULL != *server_addr) {
-      strncpy (*server_addr, mock_server_addr, len);
-    }
-  }
-
-  *port = mock_port;
-  return rtn;		
-}
-
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/
@@ -222,778 +87,6 @@ void test_closeConnection()
    close_and_unref_connection(get_global_conn());
 }

-void test_server_is_null()
-{
-  server_t test_server;
-  memset (&test_server, 0xFF, sizeof(test_server));
-  assert_int_equal (0, server_is_null (&test_server));
-  set_server_null (&test_server);
-  assert_int_equal (1, server_is_null (&test_server));
-}
-
-void test_server_list_null()
-{
-  server_list_t server_list;
-  memset (&server_list, 0xFF, sizeof(server_list));
-  assert_int_equal (0, server_is_null (&server_list.defaults));
-  assert_int_equal (0, server_is_null (&server_list.jwt));
-  assert_int_equal (0, server_is_null (&server_list.redirect));
-  set_server_list_null (&server_list);
-  assert_int_equal (1, server_is_null (&server_list.defaults));
-  assert_int_equal (1, server_is_null (&server_list.jwt));
-  assert_int_equal (1, server_is_null (&server_list.redirect));
- 
-}
-
-void test_get_current_server()
-{
-  server_list_t server_list;
-  memset (&server_list, 0xFF, sizeof(server_list));
-  assert_ptr_equal (&server_list.redirect, get_current_server (&server_list));
-  set_server_null (&server_list.redirect);
-  assert_ptr_equal (&server_list.jwt, get_current_server (&server_list));
-  set_server_null (&server_list.jwt);
-  assert_ptr_equal (&server_list.defaults, get_current_server (&server_list));
-}
-
-void test_parse_server_url ()
-{
-	server_t test_server;
-	assert_int_equal (parse_server_url ("mydns.mycom.net:8080",
-		&test_server), -1);
-	assert_int_equal (-1, test_server.allow_insecure);
-	assert_int_equal (parse_server_url ("https://mydns.mycom.net:8080",
-		&test_server), 0);
-	assert_string_equal (test_server.server_addr, "mydns.mycom.net");
-	assert_int_equal (test_server.port, 8080);
-	assert_int_equal (0, test_server.allow_insecure);
-	assert_int_equal (parse_server_url ("https://mydns.mycom.net/",
-		&test_server), 0);
-	assert_string_equal (test_server.server_addr, "mydns.mycom.net");
-	assert_int_equal (test_server.port, 443);
-	assert_int_equal (0, test_server.allow_insecure);
-	assert_int_equal (parse_server_url ("http://mydns.mycom.net:8080",
-		&test_server), 1);
-	assert_string_equal (test_server.server_addr, "mydns.mycom.net");
-	assert_int_equal (test_server.port, 8080);
-	assert_int_equal (1, test_server.allow_insecure);
-	assert_int_equal (parse_server_url ("http://mydns.mycom.net",
-		&test_server), 1);
-	assert_string_equal (test_server.server_addr, "mydns.mycom.net");
-	assert_int_equal (test_server.port, 80);
-	assert_int_equal (1, test_server.allow_insecure);
-}
-
-void test_expire_timer()
-{
-  expire_timer_t exp_timer;
-  init_expire_timer (&exp_timer);
-  assert_int_equal (false, check_timer_expired (&exp_timer, 1000));
-  sleep (2);
-  assert_int_equal (false, check_timer_expired (&exp_timer, 3000));
-  assert_int_equal (true, check_timer_expired (&exp_timer, 1000));
-}
-
-void test_backoff_delay_timer()
-{
-  backoff_timer_t btimer;
-  init_backoff_timer (&btimer, 30);
-  assert_int_equal (3, update_backoff_delay (&btimer));
-  assert_int_equal (7, update_backoff_delay (&btimer));
-  assert_int_equal (15, update_backoff_delay (&btimer));
-  assert_int_equal (30, update_backoff_delay (&btimer));
-  assert_int_equal (30, update_backoff_delay (&btimer));
-}
-
-
-void test_header_info ()
-{
-    header_info_t hinfo;
-    ParodusCfg Cfg;
-    memset(&Cfg, 0, sizeof(ParodusCfg));
-
-    parStrncpy(Cfg.hw_model, "TG1682", sizeof(Cfg.hw_model));
-    parStrncpy(Cfg.hw_manufacturer , "ARRISGroup,Inc.", sizeof(Cfg.hw_manufacturer));
-    parStrncpy(Cfg.hw_mac , "123567892366", sizeof(Cfg.hw_mac));
-    parStrncpy(Cfg.fw_name , "2.364s2", sizeof(Cfg.fw_name));
-    parStrncpy(Cfg.webpa_protocol , "WebPA-1.6", sizeof(Cfg.webpa_protocol));
-    set_parodus_cfg(&Cfg);
-
-    init_header_info (&hinfo);
-    assert_string_equal (hinfo.conveyHeader, "WebPA-1.6 (TG1682)");
-    assert_string_equal (hinfo.device_id, "mac:123567892366");
-    assert_string_equal (hinfo.user_agent,
-      "WebPA-1.6 (2.364s2; TG1682/ARRISGroup,Inc.;)");
-    free_header_info (&hinfo);
-}
-
-void test_extra_headers ()
-{
-    header_info_t hinfo;
-    ParodusCfg Cfg;
-    const char *expected_extra_headers =
-      "\r\nAuthorization: Bearer Auth---"
-      "\r\nX-WebPA-Device-Name: mac:123567892366"
-      "\r\nX-WebPA-Device-Protocols: wrp-0.11,getset-0.1"
-      "\r\nUser-Agent: WebPA-1.6 (2.364s2; TG1682/ARRISGroup,Inc.;)"
-      "\r\nX-WebPA-Convey: WebPA-1.6 (TG1682)";
-    char *extra_headers;
-    
-    memset(&Cfg, 0, sizeof(ParodusCfg));
-
-    parStrncpy (Cfg.webpa_auth_token, "Auth---", sizeof (Cfg.webpa_auth_token));
-    parStrncpy(Cfg.hw_model, "TG1682", sizeof(Cfg.hw_model));
-    parStrncpy(Cfg.hw_manufacturer , "ARRISGroup,Inc.", sizeof(Cfg.hw_manufacturer));
-    parStrncpy(Cfg.hw_mac , "123567892366", sizeof(Cfg.hw_mac));
-    parStrncpy(Cfg.fw_name , "2.364s2", sizeof(Cfg.fw_name));
-    parStrncpy(Cfg.webpa_protocol , "WebPA-1.6", sizeof(Cfg.webpa_protocol));
-    set_parodus_cfg(&Cfg);
-
-    init_header_info (&hinfo);
-    extra_headers = build_extra_hdrs (&hinfo);
-    assert_string_equal (extra_headers, expected_extra_headers);
-    free (extra_headers);
-    free_header_info (&hinfo);
-}
-
-void test_set_current_server()
-{
-  create_connection_ctx_t ctx;
-  memset (&ctx, 0xFF, sizeof(ctx));
-  set_current_server (&ctx);
-  assert_ptr_equal (&ctx.server_list.redirect, ctx.current_server);
-  set_server_null (&ctx.server_list.redirect);
-  set_current_server (&ctx);
-  assert_ptr_equal (&ctx.server_list.jwt, ctx.current_server);
-  set_server_null (&ctx.server_list.jwt);
-  set_current_server (&ctx);
-  assert_ptr_equal (&ctx.server_list.defaults, ctx.current_server);
-}
-
-void test_set_extra_headers ()
-{
-  int rtn;
-  create_connection_ctx_t ctx;
-  ParodusCfg cfg;
-  const char *expected_extra_headers =
-      "\r\nAuthorization: Bearer SER_MAC Fer23u948590 123567892366"
-      "\r\nX-WebPA-Device-Name: mac:123567892366"
-      "\r\nX-WebPA-Device-Protocols: wrp-0.11,getset-0.1"
-      "\r\nUser-Agent: WebPA-1.6 (2.364s2; TG1682/ARRISGroup,Inc.;)"
-      "\r\nX-WebPA-Convey: WebPA-1.6 (TG1682)";
-
-  memset(&cfg,0,sizeof(cfg));
-  memset (&ctx, 0, sizeof(ctx));
-
-  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));
-  parStrncpy(cfg.hw_model, "TG1682", sizeof(cfg.hw_model));
-  parStrncpy(cfg.hw_manufacturer , "ARRISGroup,Inc.", sizeof(cfg.hw_manufacturer));
-  parStrncpy(cfg.fw_name , "2.364s2", sizeof(cfg.fw_name));
-  parStrncpy(cfg.webpa_protocol , "WebPA-1.6", sizeof(cfg.webpa_protocol));
-	
-  set_parodus_cfg(&cfg);
-  rtn = init_header_info (&ctx.header_info);
-  assert_int_equal (rtn, 0);
-  assert_string_equal (ctx.header_info.device_id, "mac:123567892366");
-  assert_string_equal (ctx.header_info.user_agent,
-    "WebPA-1.6 (2.364s2; TG1682/ARRISGroup,Inc.;)");
-  assert_string_equal (ctx.header_info.conveyHeader, "WebPA-1.6 (TG1682)");
-  set_extra_headers (&ctx, true);
-  
-  assert_string_equal (get_parodus_cfg()->webpa_auth_token, 
-    "SER_MAC Fer23u948590 123567892366");
-  assert_string_equal (ctx.extra_headers, expected_extra_headers);
-  free (ctx.extra_headers);
-  free_header_info (&ctx.header_info);
-	
-}
-
-void test_find_servers ()
-{
-  ParodusCfg cfg;
-  server_list_t server_list;
-  server_t *default_server = &server_list.defaults;
-#ifdef FEATURE_DNS_QUERY
-  server_t *jwt_server = &server_list.jwt;
-#endif
-  
-  memset(&cfg,0,sizeof(cfg));
-  set_server_list_null (&server_list);
-  
-  parStrncpy (cfg.webpa_url, "mydns.mycom.net:8080", sizeof(cfg.webpa_url));
-  set_parodus_cfg(&cfg);
-  assert_int_equal (find_servers(&server_list), FIND_INVALID_DEFAULT);
-  assert_int_equal (default_server->allow_insecure, -1);
-     
-  parStrncpy (cfg.webpa_url, "https://mydns.mycom.net:8080", sizeof(cfg.webpa_url));
-
-#ifdef FEATURE_DNS_QUERY
-  cfg.acquire_jwt = 0;
-  set_parodus_cfg(&cfg);
-  assert_int_equal (find_servers(&server_list), FIND_SUCCESS);   
-  assert_int_equal (default_server->allow_insecure, 0);  
-  assert_string_equal (default_server->server_addr, "mydns.mycom.net");
-  assert_int_equal (default_server->port, 8080);
-  
-  cfg.acquire_jwt = 1;
-  mock_server_addr = "mydns.myjwtcom.net";
-  mock_port = 80;
-  set_parodus_cfg(&cfg);
-  will_return (allow_insecure_conn, -1);
-  expect_function_call (allow_insecure_conn);
-  assert_int_equal (find_servers(&server_list), FIND_JWT_FAIL);   
-  assert_int_equal (jwt_server->allow_insecure, -1);  
-
-  will_return (allow_insecure_conn, 0);
-  expect_function_call (allow_insecure_conn);
-  assert_int_equal (find_servers(&server_list), FIND_SUCCESS);   
-  assert_int_equal (jwt_server->allow_insecure, 0);
-  assert_string_equal (jwt_server->server_addr, "mydns.myjwtcom.net");
-  assert_int_equal (jwt_server->port, 80);
-  
-#else
-
-  set_parodus_cfg(&cfg);
-  assert_int_equal (find_servers(&server_list), FIND_SUCCESS);   
-  assert_int_equal (default_server->allow_insecure, 0);
-  assert_string_equal (default_server->server_addr, "mydns.mycom.net");
-  assert_int_equal (default_server->port, 8080);
-
-  free_server_list (&server_list);
-#endif
-}
-
-void test_nopoll_connect ()
-{
-  ParodusCfg cfg;
-  create_connection_ctx_t ctx;
-  noPollCtx test_nopoll_ctx;
-  server_t test_server;
-  char *test_extra_headers =
-      "\r\nAuthorization: Bearer SER_MAC Fer23u948590 123567892366"
-      "\r\nX-WebPA-Device-Name: mac:123567892366"
-      "\r\nX-WebPA-Device-Protocols: wrp-0.11,getset-0.1"
-      "\r\nUser-Agent: WebPA-1.6 (2.364s2; TG1682/ARRISGroup,Inc.;)"
-      "\r\nX-WebPA-Convey: WebPA-1.6 (TG1682)";
-
-  ctx.nopoll_ctx = &test_nopoll_ctx;
-  ctx.current_server = &test_server;
-  ctx.extra_headers = test_extra_headers;
-  memset(&cfg,0,sizeof(cfg));
-  parStrncpy (cfg.webpa_url, "http://mydns.mycom.net:8080", sizeof(cfg.webpa_url));
-  set_parodus_cfg(&cfg);
-  init_expire_timer (&ctx.connect_timer);
-
-  test_server.allow_insecure = 1;
-  test_server.server_addr = "mydns.mycom.net";
-  test_server.port = 8080;
-  will_return (nopoll_conn_new_opts, &connection1);
-  expect_function_call (nopoll_conn_new_opts);
-  assert_int_equal (nopoll_connect (&ctx, true), 1);
-  assert_ptr_equal(&connection1, get_global_conn());
- 
-  test_server.allow_insecure = 0;
-  will_return (nopoll_conn_tls_new6, &connection2);
-  expect_function_call (nopoll_conn_tls_new6);
-  assert_int_equal (nopoll_connect (&ctx, true), 1);
-  assert_ptr_equal(&connection2, get_global_conn());
-  
-  will_return (nopoll_conn_tls_new, &connection3);
-  expect_function_call (nopoll_conn_tls_new);
-  assert_int_equal (nopoll_connect (&ctx, false), 1);
-  assert_ptr_equal(&connection3, get_global_conn());
-  
-  test_server.allow_insecure = 1;
-  will_return (nopoll_conn_new_opts, NULL);
-  expect_function_call (nopoll_conn_new_opts);
-  will_return (checkHostIp, 0);
-  expect_function_call (checkHostIp);
-  assert_int_equal (nopoll_connect (&ctx, true), 0);
-  assert_ptr_equal(NULL, get_global_conn());
-  
-  test_server.allow_insecure = 0;
-  will_return (nopoll_conn_tls_new6, NULL);
-  expect_function_call (nopoll_conn_tls_new6);
-  will_return (checkHostIp, 0);
-  expect_function_call (checkHostIp);
-  assert_int_equal (nopoll_connect (&ctx, true), 0);
-  assert_ptr_equal(NULL, get_global_conn());
-
-  will_return (nopoll_conn_tls_new6, NULL);
-  expect_function_call (nopoll_conn_tls_new6);
-  will_return (checkHostIp, -2);
-  expect_function_call (checkHostIp);
-  assert_int_equal (nopoll_connect (&ctx, true), 0);
-  assert_ptr_equal(NULL, get_global_conn());
-
-  will_return (nopoll_conn_tls_new6, NULL);
-  expect_function_call (nopoll_conn_tls_new6);
-  will_return (checkHostIp, -2);
-  expect_function_call (checkHostIp);
-  ctx.connect_timer.start_time.tv_sec -= (15*60);
-  will_return(kill, 1);
-  expect_function_call(kill);
-  assert_int_equal (nopoll_connect (&ctx, true), 0);
-  assert_ptr_equal(NULL, get_global_conn());
-
-  init_expire_timer (&ctx.connect_timer);
-  will_return (nopoll_conn_tls_new, NULL);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (checkHostIp, 0);
-  expect_function_call (checkHostIp);
-  assert_int_equal (nopoll_connect (&ctx, false), 0);
-  assert_ptr_equal(NULL, get_global_conn());
-}
-
-// 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
-
-void test_wait_connection_ready ()
-{
-  create_connection_ctx_t ctx;
-  ParodusCfg Cfg;
-  const char *expected_extra_headers =
-      "\r\nAuthorization: Bearer Auth---"
-      "\r\nX-WebPA-Device-Name: mac:123567892366"
-      "\r\nX-WebPA-Device-Protocols: wrp-0.11,getset-0.1"
-      "\r\nUser-Agent: WebPA-1.6 (2.364s2; TG1682/ARRISGroup,Inc.;)"
-      "\r\nX-WebPA-Convey: WebPA-1.6 (TG1682)";
-
-  memset(&ctx,0,sizeof(ctx));
-  set_server_list_null (&ctx.server_list);
-
-  mock_wait_status = 0;
-  mock_redirect = NULL;
-  
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  assert_int_equal (wait_connection_ready (&ctx), WAIT_SUCCESS);
-  
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  assert_int_equal (wait_connection_ready (&ctx), WAIT_FAIL);
-  
-  mock_wait_status = 307;
-  mock_redirect = "mydns.mycom.net";
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  assert_int_equal (wait_connection_ready (&ctx), WAIT_FAIL);
-  
-  mock_wait_status = 302;
-  mock_redirect = "https://mydns.mycom.net:8080";
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  assert_int_equal (wait_connection_ready (&ctx), WAIT_ACTION_RETRY);
-  assert_string_equal (ctx.server_list.redirect.server_addr, "mydns.mycom.net");
-  assert_int_equal (ctx.server_list.redirect.port, 8080);
-  assert_int_equal (0, ctx.server_list.redirect.allow_insecure);
-  assert_ptr_equal (ctx.current_server, &ctx.server_list.redirect);
-  free_server (&ctx.server_list.redirect);
-  
-  mock_wait_status = 303;
-  mock_redirect = "http://mydns.mycom.net";
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  assert_int_equal (wait_connection_ready (&ctx), WAIT_ACTION_RETRY);
-  assert_string_equal (ctx.server_list.redirect.server_addr, "mydns.mycom.net");
-  assert_int_equal (ctx.server_list.redirect.port, 80);
-  assert_int_equal (1, ctx.server_list.redirect.allow_insecure);
-  assert_ptr_equal (ctx.current_server, &ctx.server_list.redirect);
-  free_server (&ctx.server_list.redirect);
-  
-    mock_wait_status = 403;
-    memset(&Cfg, 0, sizeof(ParodusCfg));
-
-    parStrncpy (Cfg.webpa_auth_token, "Auth---", sizeof (Cfg.webpa_auth_token));
-    parStrncpy(Cfg.hw_model, "TG1682", sizeof(Cfg.hw_model));
-    parStrncpy(Cfg.hw_manufacturer , "ARRISGroup,Inc.", sizeof(Cfg.hw_manufacturer));
-    parStrncpy(Cfg.hw_mac , "123567892366", sizeof(Cfg.hw_mac));
-    parStrncpy(Cfg.fw_name , "2.364s2", sizeof(Cfg.fw_name));
-    parStrncpy(Cfg.webpa_protocol , "WebPA-1.6", sizeof(Cfg.webpa_protocol));
-    set_parodus_cfg(&Cfg);
-  
-    init_header_info (&ctx.header_info);
-    will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
-    expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-    assert_int_equal (wait_connection_ready (&ctx), WAIT_ACTION_RETRY);
-    
-    assert_string_equal (ctx.extra_headers, expected_extra_headers);
-    free_extra_headers (&ctx);
-    free_header_info (&ctx.header_info);
-}
-
-// Return codes for connect_and_wait
-#define CONN_WAIT_SUCCESS	0
-#define CONN_WAIT_ACTION_RETRY	1	// if wait_status is 307, 302, 303 or 403
-#define CONN_WAIT_RETRY_DNS 	2
-
-void test_connect_and_wait ()
-{
-  create_connection_ctx_t ctx;
-  noPollCtx test_nopoll_ctx;
-  server_t test_server;
-  ParodusCfg Cfg;
-  char *test_extra_headers =
-      "\r\nAuthorization: Bearer SER_MAC Fer23u948590 123567892366"
-      "\r\nX-WebPA-Device-Name: mac:123567892366"
-      "\r\nX-WebPA-Device-Protocols: wrp-0.11,getset-0.1"
-      "\r\nUser-Agent: WebPA-1.6 (2.364s2; TG1682/ARRISGroup,Inc.;)"
-      "\r\nX-WebPA-Convey: WebPA-1.6 (TG1682)";
-
-  memset(&Cfg, 0, sizeof(ParodusCfg));
-  parStrncpy (Cfg.webpa_url, "http://mydns.mycom.net:8080", sizeof(Cfg.webpa_url));
-
-  mock_wait_status = 0;
-  
-  memset(&ctx,0,sizeof(ctx));
-  ctx.nopoll_ctx = &test_nopoll_ctx;
-  ctx.current_server = &test_server;
-  ctx.extra_headers = test_extra_headers;
-
-  Cfg.flags = FLAGS_IPV4_ONLY;
-  set_parodus_cfg(&Cfg);
-
-  test_server.allow_insecure = 1;
-  test_server.server_addr = "mydns.mycom.net";
-  test_server.port = 8080;
-  will_return (nopoll_conn_new_opts, NULL);
-  expect_function_call (nopoll_conn_new_opts);
-  will_return (checkHostIp, 0);
-  expect_function_call (checkHostIp);
-  assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_RETRY_DNS);
-  
-  Cfg.flags = 0;
-  set_parodus_cfg(&Cfg);
-
-  will_return (nopoll_conn_new_opts, &connection1);
-  expect_function_call (nopoll_conn_new_opts);
-  will_return (nopoll_conn_is_ok, nopoll_false);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_ref_count, 0);
-  expect_function_call (nopoll_conn_ref_count);
-  assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_RETRY_DNS);
-
-  will_return (nopoll_conn_new_opts, &connection1);
-  expect_function_call (nopoll_conn_new_opts);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_SUCCESS);
-
-  Cfg.flags = FLAGS_IPV6_ONLY;
-  set_parodus_cfg(&Cfg);
-
-  test_server.allow_insecure = 0;
-  will_return (nopoll_conn_tls_new6, NULL);
-  expect_function_call (nopoll_conn_tls_new6);
-  will_return (checkHostIp, 0);
-  expect_function_call (checkHostIp);
-  assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_RETRY_DNS);
-  
-  Cfg.flags = 0;
-  set_parodus_cfg(&Cfg);
-
-  will_return (nopoll_conn_tls_new6, NULL);
-  expect_function_call (nopoll_conn_tls_new6);
-  will_return (checkHostIp, 0);
-  expect_function_call (checkHostIp);
-  will_return (nopoll_conn_tls_new, NULL);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (checkHostIp, 0);
-  expect_function_call (checkHostIp);
-  assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_RETRY_DNS);
-
-  will_return (nopoll_conn_tls_new6, &connection1);
-  expect_function_call (nopoll_conn_tls_new6);
-  will_return (nopoll_conn_is_ok, nopoll_false);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_ref_count, 0);
-  expect_function_call (nopoll_conn_ref_count);
-  will_return (nopoll_conn_tls_new, NULL);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (checkHostIp, 0);
-  expect_function_call (checkHostIp);
-  assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_RETRY_DNS);
-
-  will_return (nopoll_conn_tls_new6, &connection1);
-  expect_function_call (nopoll_conn_tls_new6);
-  will_return (nopoll_conn_is_ok, nopoll_false);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_ref_count, 0);
-  expect_function_call (nopoll_conn_ref_count);
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_SUCCESS);
-  
-  Cfg.flags = FLAGS_IPV4_ONLY;
-  set_parodus_cfg(&Cfg);
-
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  mock_wait_status = 307;
-  mock_redirect = "mydns.mycom.net";
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  will_return (nopoll_conn_ref_count, 0);
-  expect_function_call (nopoll_conn_ref_count);
-  assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_RETRY_DNS);
-
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  mock_wait_status = 302;
-  mock_redirect = "https://mydns.mycom.net";
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  will_return (nopoll_conn_ref_count, 0);
-  expect_function_call (nopoll_conn_ref_count);
-  assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_ACTION_RETRY);
-}
-
-void test_keep_trying ()
-{
-  int rtn;	
-  create_connection_ctx_t ctx;
-  noPollCtx test_nopoll_ctx;
-  server_t test_server;
-  ParodusCfg Cfg;
-  char *test_extra_headers =
-      "\r\nAuthorization: Bearer SER_MAC Fer23u948590 123567892366"
-      "\r\nX-WebPA-Device-Name: mac:123567892366"
-      "\r\nX-WebPA-Device-Protocols: wrp-0.11,getset-0.1"
-      "\r\nUser-Agent: WebPA-1.6 (2.364s2; TG1682/ARRISGroup,Inc.;)"
-      "\r\nX-WebPA-Convey: WebPA-1.6 (TG1682)";
-
-  memset(&Cfg, 0, sizeof(ParodusCfg));
-  parStrncpy (Cfg.webpa_url, "http://mydns.mycom.net:8080", sizeof(Cfg.webpa_url));
-
-  mock_wait_status = 0;
-
-  memset(&ctx,0,sizeof(ctx));
-  ctx.nopoll_ctx = &test_nopoll_ctx;
-  ctx.current_server = &test_server;
-  ctx.extra_headers = test_extra_headers;
-
-  test_server.allow_insecure = 1;
-  test_server.server_addr = "mydns.mycom.net";
-  test_server.port = 8080;
-
-  Cfg.flags = 0;
-  set_parodus_cfg(&Cfg);
-
-  will_return (nopoll_conn_new_opts, &connection1);
-  expect_function_call (nopoll_conn_new_opts);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  rtn = keep_trying_to_connect (&ctx, 30, -1);
-  assert_int_equal (rtn, true);
-
-  test_server.allow_insecure = 0;
-  Cfg.flags = FLAGS_IPV4_ONLY;
-  set_parodus_cfg(&Cfg);
-
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  mock_wait_status = 302;
-  mock_redirect = "https://mydns.mycom.net";
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  will_return (nopoll_conn_ref_count, 0);
-  expect_function_call (nopoll_conn_ref_count);
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  mock_wait_status = 0;
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  rtn = keep_trying_to_connect (&ctx, 30, 0);
-  assert_int_equal (rtn, true);
-
-  will_return (nopoll_conn_tls_new, NULL);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (checkHostIp, 0);
-  expect_function_call (checkHostIp);
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  rtn = keep_trying_to_connect (&ctx, 30, 0);
-  assert_int_equal (rtn, true);
-
-  mock_wait_status = 302;
-  mock_redirect = "mydns.mycom.net";
-
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  will_return (nopoll_conn_ref_count, 0);
-  expect_function_call (nopoll_conn_ref_count);
-  rtn = keep_trying_to_connect (&ctx, 30, -1);
-  assert_int_equal (rtn, false);
-}
-
-void test_create_nopoll_connection()
-{
-  int rtn;
-  ParodusCfg cfg;
-  noPollCtx test_nopoll_ctx;
-
-  memset(&cfg,0,sizeof(cfg));
-  cfg.flags = 0;
-  parStrncpy (cfg.webpa_url, "mydns.mycom.net:8080", sizeof(cfg.webpa_url));
-  cfg.boot_time = 25;
-  parStrncpy (cfg.hw_last_reboot_reason, "Test reason", sizeof(cfg.hw_last_reboot_reason));
-  cfg.webpa_backoff_max = 30;
-  parStrncpy (cfg.webpa_auth_token, "Auth---", sizeof (cfg.webpa_auth_token));
-  parStrncpy(cfg.hw_model, "TG1682", sizeof(cfg.hw_model));
-  parStrncpy(cfg.hw_manufacturer , "ARRISGroup,Inc.", sizeof(cfg.hw_manufacturer));
-  parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
-  parStrncpy(cfg.fw_name , "2.364s2", sizeof(cfg.fw_name));
-  parStrncpy(cfg.webpa_protocol , "WebPA-1.6", sizeof(cfg.webpa_protocol));
-  set_parodus_cfg(&cfg);
-  rtn = createNopollConnection (&test_nopoll_ctx);
-  assert_int_equal (rtn, nopoll_false);
-
-  parStrncpy (cfg.webpa_url, "http://mydns.mycom.net:8080", sizeof(cfg.webpa_url));
-  set_parodus_cfg(&cfg);
-
-  mock_wait_status = 0;
-  
-  will_return (nopoll_conn_new_opts, &connection1);
-  expect_function_call (nopoll_conn_new_opts);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  rtn = createNopollConnection (&test_nopoll_ctx);
-  assert_int_equal (rtn, nopoll_true);
-
-  parStrncpy (cfg.webpa_url, "https://mydns.mycom.net:8080", sizeof(cfg.webpa_url));
-  cfg.flags = 0;
-  set_parodus_cfg(&cfg);
-
-  will_return (nopoll_conn_tls_new6, &connection1);
-  expect_function_call (nopoll_conn_tls_new6);
-  will_return (nopoll_conn_is_ok, nopoll_false);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_ref_count, 0);
-  expect_function_call (nopoll_conn_ref_count);
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  rtn = createNopollConnection (&test_nopoll_ctx);
-  assert_int_equal (rtn, nopoll_true);
-
-  will_return (nopoll_conn_tls_new6, &connection1);
-  expect_function_call (nopoll_conn_tls_new6);
-  will_return (nopoll_conn_is_ok, nopoll_false);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_ref_count, 0);
-  expect_function_call (nopoll_conn_ref_count);
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  mock_wait_status = 302;
-  mock_redirect = "https://mydns.mycom.net";
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  will_return (nopoll_conn_ref_count, 0);
-  expect_function_call (nopoll_conn_ref_count);
-
-  will_return (nopoll_conn_tls_new6, &connection1);
-  expect_function_call (nopoll_conn_tls_new6);
-  will_return (nopoll_conn_is_ok, nopoll_false);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_ref_count, 0);
-  expect_function_call (nopoll_conn_ref_count);
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  mock_wait_status = 0;
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  rtn = createNopollConnection (&test_nopoll_ctx);
-  assert_int_equal (rtn, nopoll_true);
-
-#ifdef FEATURE_DNS_QUERY
-  cfg.acquire_jwt = 1;
-  cfg.flags = FLAGS_IPV4_ONLY;
-  set_parodus_cfg(&cfg);
-  
-  will_return (allow_insecure_conn, -1);
-  expect_function_call (allow_insecure_conn);
-  will_return (nopoll_conn_tls_new, NULL);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (checkHostIp, 0);
-  expect_function_call (checkHostIp);
-  mock_server_addr = "mydns.myjwtcom.net";
-  mock_port = 80;
-  will_return (allow_insecure_conn, 0);
-  expect_function_call (allow_insecure_conn);
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  rtn = createNopollConnection (&test_nopoll_ctx);
-  assert_int_equal (rtn, nopoll_true);
-    
-  cfg.flags = 0;
-  set_parodus_cfg(&cfg);
-
-  will_return (allow_insecure_conn, -1);
-  expect_function_call (allow_insecure_conn);
-  will_return (nopoll_conn_tls_new6, &connection1);
-  expect_function_call (nopoll_conn_tls_new6);
-  will_return (nopoll_conn_is_ok, nopoll_false);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_ref_count, 0);
-  expect_function_call (nopoll_conn_ref_count);
-  mock_wait_status = 0;
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  rtn = createNopollConnection (&test_nopoll_ctx);
-  assert_int_equal (rtn, nopoll_true);
-#endif
-
-}
-
-
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
@@ -1005,22 +98,6 @@ int main(void)
        cmocka_unit_test(test_get_global_reconnect_reason),
        cmocka_unit_test(test_set_global_reconnect_reason),
        cmocka_unit_test(test_closeConnection),
-        cmocka_unit_test(test_server_is_null),
-        cmocka_unit_test(test_server_list_null),
-        cmocka_unit_test(test_get_current_server),
-        cmocka_unit_test(test_parse_server_url),
-        cmocka_unit_test(test_expire_timer),
-        cmocka_unit_test(test_backoff_delay_timer),
-        cmocka_unit_test(test_header_info),
-        cmocka_unit_test(test_extra_headers),
-        cmocka_unit_test(test_set_current_server),
-        cmocka_unit_test(test_set_extra_headers),
-        cmocka_unit_test(test_find_servers),
-        cmocka_unit_test(test_nopoll_connect),
-        cmocka_unit_test(test_wait_connection_ready),
-        cmocka_unit_test(test_connect_and_wait),
-        cmocka_unit_test(test_keep_trying),
-	cmocka_unit_test(test_create_nopoll_connection)
    };

    return cmocka_run_group_tests(tests, NULL, NULL);
--- a/tests/test_createConnection.c
+++ b/tests/test_createConnection.c
--- a/tests/test_crud_interface.c
+++ b/tests/test_crud_interface.c
@@ -1,395 +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                           */
-/*----------------------------------------------------------------------------*/
-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);
@@ -68,20 +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 = "tag-update";
-			(*msg)->u.crud.transaction_uuid = "1234";
-	}
+    (*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);
    return (ssize_t) mock();
 }

@@ -204,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                             */
 /*----------------------------------------------------------------------------*/
@@ -234,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
@@ -58,7 +58,7 @@ static test_t tests[] = {

            .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.source = "fake-client1",
            .r.u.crud.dest = "fake-server1",
            .r.u.crud.partner_ids = NULL,
            .r.u.crud.headers = NULL,
@@ -88,7 +88,7 @@ static test_t tests[] = {

            .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.source = "fake-client2",
            .r.u.crud.dest = "fake-server2",
            .r.u.crud.partner_ids = NULL,
            .r.u.crud.headers = NULL,
@@ -118,7 +118,7 @@ static test_t tests[] = {

            .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.source = "fake-client3",
            .r.u.crud.dest = "fake-server3",
            .r.u.crud.partner_ids = NULL,
            .r.u.crud.headers = NULL,
@@ -148,7 +148,7 @@ static test_t tests[] = {

            .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.source = "fake-client4",
            .r.u.crud.dest = "fake-server4",
            .r.u.crud.partner_ids = NULL,
            .r.u.crud.headers = NULL,
@@ -180,12 +180,6 @@ 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;
--- 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[3], NULL, test_mutexResetTimer, NULL);
-	pthread_join(thread[3], 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_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_service_alive.c
+++ b/tests/test_service_alive.c
@@ -38,16 +38,7 @@ pthread_t threadId;
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/

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

-void *CRUDHandlerTask()
-{
-	return NULL;
-}
 static void add_client()
 {
 	const wrp_msg_t reg = { .msg_type = WRP_MSG_TYPE__SVC_REGISTRATION,
@@ -123,11 +114,6 @@ static void *client_rcv_task()
 	return 0;	
 }

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

 static void *keep_alive_thread()
 {
@@ -158,10 +144,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 ) 
 	{
@@ -171,9 +156,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
@@ -202,6 +187,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_token.c
+++ b/tests/test_token.c
@@ -24,7 +24,6 @@
 #include <cmocka.h>
 #include <assert.h>
 #include <cjwt/cjwt.h>
-#include <wrp-c.h>

 #include "../src/token.h"
 #include "../src/ParodusInternal.h"
@@ -39,11 +38,11 @@ time_t exp_time_bad  = 1463955372;		// 5/22/2016

 const char *payload_good  = "{" \
 	"\"iss\":	\"SHA256:jdcRysFunWUAT852huQoIM9GN6k2s5c7iTMTMgujPAk\"," \
-	"\"endpoint\":	\"https://mydns.mycom.net:8080/\"}";
+	"\"endpoint\":	\"https://fabric.webpa.comcast.net:8080/\"}";

 const char *payload_insec  = "{" \
 	"\"iss\":	\"SHA256:jdcRysFunWUAT852huQoIM9GN6k2s5c7iTMTMgujPAk\"," \
-	"\"endpoint\":	\"http://mydns.mycom.net:8080/\"}";
+	"\"endpoint\":	\"http://fabric.webpa.comcast.net:8080/\"}";

 // missing endpoint
 const char *payload_no_end  = "{" \
@@ -53,89 +52,69 @@ 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"
+	"\"03:ji81f9B4vnaENEZJgPzYiYdVLvbkgg9rbI7RVcEjutIszb7XZA\"\n"
+	"\"01:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1MTQ3NjQ3OTksImlzcyI6IlNIQTI1NjpqZGNSeXNGdW5XVUFUODUyaHVRb0lNOUdONmsyczVjN2lUTVRNZ3VqUEFrIiwiZW5kcG9pbnQiOiJodHRwczovL2ZhYnJpYy53ZWJwYS5jb21jYXN0Lm5ldDo4MDgwLyJ9.ahYvcvZxKfKt-enfMZOT9JwCr7eGECv2fUYEDbVdm\"\n"
+	"\"02:X1Jq1iPnD8MqkSOyHUQ8a17DOFQSmv8C3ZTKkjtFHEUR8l-KYhaA8bmU7Fzo8m0f4Ub411p4r4VE3KOdv8TWbKgKKIElONJmimpCDvHaUG6SZTaGB_proHyw5Vy5RzK4EAUc0C36hPBF6pIQfl5DgT1I66MHDcklMx2af2_F26Wv4rRX3pU_Q6fvustJhRTBcCJa7S6NZrm_Ca9rkRk5v2dyXkzrrB0_PCIoHITom8DPF8N56EDGzLyY25-\"\n"
 ;

 const char *dns_recs_extra =
-	"\"03:iJmBr4pGROCCbRlbL3GpGDcSFJcaqBQFOriTRk0xKQ\"\n"
-	"\"01:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJTSEEyNTY6amRjUnlzRnVuV1VBVDg1Mmh1UW9JTTlHTjZrMnM1YzdpVE1UTWd1alBBayIsImVuZHBvaW50IjoiaHR0cHM6Ly9teWRucy5teWNvbS5uZXQ6ODA4MC8iLCJleHAiOjIxNDc0ODM2NDd9.VjG2PzPws2J707PiEaUGOTXD9NWnrGyfAUvvfyXFw-Px3gx5wg1\"\n"
+	"\"03:ji81f9B4vnaENEZJgPzYiYdVLvbkgg9rbI7RVcEjutIszb7XZA\"\n"
+	"\"01:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1MTQ3NjQ3OTksImlzcyI6IlNIQTI1NjpqZGNSeXNGdW5XVUFUODUyaHVRb0lNOUdONmsyczVjN2lUTVRNZ3VqUEFrIiwiZW5kcG9pbnQiOiJodHRwczovL2ZhYnJpYy53ZWJwYS5jb21jYXN0Lm5ldDo4MDgwLyJ9.ahYvcvZxKfKt-enfMZOT9JwCr7eGECv2fUYEDbVdm\"\n"
 	"\n" // non-txt record type
-	"\"02:EXGyJQXrxMYuepAiFPT0sWxvydHvZKxcx7S5MCmlOhRpWZRrzgFceNWMwFcRPAPxovOoc4aYvx2DqGMdckmAD1q3y3Gjjw1qyxd4503jmrXKfjrdW3eFZD_Q454iRVf4c0CMWA5tl0ElOlX9u_HC3G_dPiKGUBU5PpWONgHpg2-ewrQcUe4-J4hBQmqZmRSB9n-6zB1XD80cDQO7aHeJ9aysJS1vgmwaSuT9y6PhPsp05NUC0TDzZVJUX\"\n"
+	"\"02:X1Jq1iPnD8MqkSOyHUQ8a17DOFQSmv8C3ZTKkjtFHEUR8l-KYhaA8bmU7Fzo8m0f4Ub411p4r4VE3KOdv8TWbKgKKIElONJmimpCDvHaUG6SZTaGB_proHyw5Vy5RzK4EAUc0C36hPBF6pIQfl5DgT1I66MHDcklMx2af2_F26Wv4rRX3pU_Q6fvustJhRTBcCJa7S6NZrm_Ca9rkRk5v2dyXkzrrB0_PCIoHITom8DPF8N56EDGzLyY25-\"\n"
 ;

 char *rr_recs_test[] = {
-	"eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJTSEEyNTY6amRjUnlzRnVuV1VBVDg1Mmh1UW9JTTlHTjZrMnM1YzdpVE1UTWd1alBBayIsImVuZHBvaW50IjoiaHR0cHM6Ly9teWRucy5teWNvbS5uZXQ6ODA4MC8iLCJleHAiOjIxNDc0ODM2NDd9.VjG2PzPws2J707PiEaUGOTXD9NWnrGyfAUvvfyXFw-Px3gx5wg1",
-	"EXGyJQXrxMYuepAiFPT0sWxvydHvZKxcx7S5MCmlOhRpWZRrzgFceNWMwFcRPAPxovOoc4aYvx2DqGMdckmAD1q3y3Gjjw1qyxd4503jmrXKfjrdW3eFZD_Q454iRVf4c0CMWA5tl0ElOlX9u_HC3G_dPiKGUBU5PpWONgHpg2-ewrQcUe4-J4hBQmqZmRSB9n-6zB1XD80cDQO7aHeJ9aysJS1vgmwaSuT9y6PhPsp05NUC0TDzZVJUX",
-	"iJmBr4pGROCCbRlbL3GpGDcSFJcaqBQFOriTRk0xKQ"
+	"eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1MTQ3NjQ3OTksImlzcyI6IlNIQTI1NjpqZGNSeXNGdW5XVUFUODUyaHVRb0lNOUdONmsyczVjN2lUTVRNZ3VqUEFrIiwiZW5kcG9pbnQiOiJodHRwczovL2ZhYnJpYy53ZWJwYS5jb21jYXN0Lm5ldDo4MDgwLyJ9.ahYvcvZxKfKt-enfMZOT9JwCr7eGECv2fUYEDbVdm",
+	"X1Jq1iPnD8MqkSOyHUQ8a17DOFQSmv8C3ZTKkjtFHEUR8l-KYhaA8bmU7Fzo8m0f4Ub411p4r4VE3KOdv8TWbKgKKIElONJmimpCDvHaUG6SZTaGB_proHyw5Vy5RzK4EAUc0C36hPBF6pIQfl5DgT1I66MHDcklMx2af2_F26Wv4rRX3pU_Q6fvustJhRTBcCJa7S6NZrm_Ca9rkRk5v2dyXkzrrB0_PCIoHITom8DPF8N56EDGzLyY25-",
+	"ji81f9B4vnaENEZJgPzYiYdVLvbkgg9rbI7RVcEjutIszb7XZA"
 };

 char *dns_jwt_test = 
-	"eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJTSEEyNTY6amRjUnlzRnVuV1VBVDg1Mmh1UW9JTTlHTjZrMnM1YzdpVE1UTWd1alBBayIsImVuZHBvaW50IjoiaHR0cHM6Ly9teWRucy5teWNvbS5uZXQ6ODA4MC8iLCJleHAiOjIxNDc0ODM2NDd9.VjG2PzPws2J707PiEaUGOTXD9NWnrGyfAUvvfyXFw-Px3gx5wg1"
-	"EXGyJQXrxMYuepAiFPT0sWxvydHvZKxcx7S5MCmlOhRpWZRrzgFceNWMwFcRPAPxovOoc4aYvx2DqGMdckmAD1q3y3Gjjw1qyxd4503jmrXKfjrdW3eFZD_Q454iRVf4c0CMWA5tl0ElOlX9u_HC3G_dPiKGUBU5PpWONgHpg2-ewrQcUe4-J4hBQmqZmRSB9n-6zB1XD80cDQO7aHeJ9aysJS1vgmwaSuT9y6PhPsp05NUC0TDzZVJUX"
-	"iJmBr4pGROCCbRlbL3GpGDcSFJcaqBQFOriTRk0xKQ"
+	"eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1MTQ3NjQ3OTksImlzcyI6IlNIQTI1NjpqZGNSeXNGdW5XVUFUODUyaHVRb0lNOUdONmsyczVjN2lUTVRNZ3VqUEFrIiwiZW5kcG9pbnQiOiJodHRwczovL2ZhYnJpYy53ZWJwYS5jb21jYXN0Lm5ldDo4MDgwLyJ9.ahYvcvZxKfKt-enfMZOT9JwCr7eGECv2fUYEDbVdm"
+	"X1Jq1iPnD8MqkSOyHUQ8a17DOFQSmv8C3ZTKkjtFHEUR8l-KYhaA8bmU7Fzo8m0f4Ub411p4r4VE3KOdv8TWbKgKKIElONJmimpCDvHaUG6SZTaGB_proHyw5Vy5RzK4EAUc0C36hPBF6pIQfl5DgT1I66MHDcklMx2af2_F26Wv4rRX3pU_Q6fvustJhRTBcCJa7S6NZrm_Ca9rkRk5v2dyXkzrrB0_PCIoHITom8DPF8N56EDGzLyY25-"
+	"ji81f9B4vnaENEZJgPzYiYdVLvbkgg9rbI7RVcEjutIszb7XZA"
 ;


-/*
-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\""
+const char *dns_recs_fabric =
+	"\"eyJhbGciOiJub25lIiwidHlwIjoiSldUIn0.eyJlbmRwb2ludCI6Imh0dHBzOi8vZmFicmljLndlYnBhLmNvbWNhc3QubmV0OjgwODAvIn0.24cvUmCGYqqXuSsgC7nNnle2JH-uy6Jwp5BKXADhXpc\""
 ;

-// no exp in it
-char *rr_recs2_test[] = {
-	"eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbmRwb2ludCI6Imh0dHBzOi8vbXlkbnMubXljb20ubmV0OjgwODAvIn0.YkudDhp7Ifr6wTsCfrYUUeRf1CMKannC6Bx994OrcBVwqNQ1G5uBXEgsslUnbqV_7FTGPp1Vs058qncmIXtEYxVlHt-mn1UEm6hyC_QGi9FfMHYBS7QHwcCIs467XUFMZayQ3upzZNXObhzJNF0-RR72S61cjSGqf1z5KgyBtoANtW6xCdWB5VV6CqCxlmJNj6d4N8vKiUvN346-UgB_H4AuaXCNdXJ2NP2DxRec-oNTCjhNzRn-6MaB-UwW_gD9CYfQ0vrw2Nv8dO1Sk5Ku94cdIfvUEft-kyqPGKmK8soIggjvmvW0JEPYwrWYY9Ry5SQf80-dLOPXCQSQ3Rzy7Q"
+char *rr_recs_fabric[] = {
+	"eyJhbGciOiJub25lIiwidHlwIjoiSldUIn0.eyJlbmRwb2ludCI6Imh0dHBzOi8vZmFicmljLndlYnBhLmNvbWNhc3QubmV0OjgwODAvIn0.24cvUmCGYqqXuSsgC7nNnle2JH-uy6Jwp5BKXADhXpc"
 };

 const char *dns_recs_err1 = // missing seq
-	"\"03:iJmBr4pGROCCbRlbL3GpGDcSFJcaqBQFOriTRk0xKQ\"\n"
-	"\"eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJTSEEyNTY6amRjUnlzRnVuV1VBVDg1Mmh1UW9JTTlHTjZrMnM1YzdpVE1UTWd1alBBayIsImVuZHBvaW50IjoiaHR0cHM6Ly9teWRucy5teWNvbS5uZXQ6ODA4MC8iLCJleHAiOjIxNDc0ODM2NDd9.VjG2PzPws2J707PiEaUGOTXD9NWnrGyfAUvvfyXFw-Px3gx5wg1\"\n"
-	"\"02:EXGyJQXrxMYuepAiFPT0sWxvydHvZKxcx7S5MCmlOhRpWZRrzgFceNWMwFcRPAPxovOoc4aYvx2DqGMdckmAD1q3y3Gjjw1qyxd4503jmrXKfjrdW3eFZD_Q454iRVf4c0CMWA5tl0ElOlX9u_HC3G_dPiKGUBU5PpWONgHpg2-ewrQcUe4-J4hBQmqZmRSB9n-6zB1XD80cDQO7aHeJ9aysJS1vgmwaSuT9y6PhPsp05NUC0TDzZVJUX\"\n"
+	"\"03:ji81f9B4vnaENEZJgPzYiYdVLvbkgg9rbI7RVcEjutIszb7XZA\"\n"
+	"\"eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1MTQ3NjQ3OTksImlzcyI6IlNIQTI1NjpqZGNSeXNGdW5XVUFUODUyaHVRb0lNOUdONmsyczVjN2lUTVRNZ3VqUEFrIiwiZW5kcG9pbnQiOiJodHRwczovL2ZhYnJpYy53ZWJwYS5jb21jYXN0Lm5ldDo4MDgwLyJ9.ahYvcvZxKfKt-enfMZOT9JwCr7eGECv2fUYEDbVdm\"\n"
+	"\"02:X1Jq1iPnD8MqkSOyHUQ8a17DOFQSmv8C3ZTKkjtFHEUR8l-KYhaA8bmU7Fzo8m0f4Ub411p4r4VE3KOdv8TWbKgKKIElONJmimpCDvHaUG6SZTaGB_proHyw5Vy5RzK4EAUc0C36hPBF6pIQfl5DgT1I66MHDcklMx2af2_F26Wv4rRX3pU_Q6fvustJhRTBcCJa7S6NZrm_Ca9rkRk5v2dyXkzrrB0_PCIoHITom8DPF8N56EDGzLyY25-\"\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"
+	"\"03:ji81f9B4vnaENEZJgPzYiYdVLvbkgg9rbI7RVcEjutIszb7XZA\"\n"
+	"\"0:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1MTQ3NjQ3OTksImlzcyI6IlNIQTI1NjpqZGNSeXNGdW5XVUFUODUyaHVRb0lNOUdONmsyczVjN2lUTVRNZ3VqUEFrIiwiZW5kcG9pbnQiOiJodHRwczovL2ZhYnJpYy53ZWJwYS5jb21jYXN0Lm5ldDo4MDgwLyJ9.ahYvcvZxKfKt-enfMZOT9JwCr7eGECv2fUYEDbVdm\"\n"
+	"\"02:X1Jq1iPnD8MqkSOyHUQ8a17DOFQSmv8C3ZTKkjtFHEUR8l-KYhaA8bmU7Fzo8m0f4Ub411p4r4VE3KOdv8TWbKgKKIElONJmimpCDvHaUG6SZTaGB_proHyw5Vy5RzK4EAUc0C36hPBF6pIQfl5DgT1I66MHDcklMx2af2_F26Wv4rRX3pU_Q6fvustJhRTBcCJa7S6NZrm_Ca9rkRk5v2dyXkzrrB0_PCIoHITom8DPF8N56EDGzLyY25-\"\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"
+	"\"03:ji81f9B4vnaENEZJgPzYiYdVLvbkgg9rbI7RVcEjutIszb7XZA\"\n"
+	"\"99:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1MTQ3NjQ3OTksImlzcyI6IlNIQTI1NjpqZGNSeXNGdW5XVUFUODUyaHVRb0lNOUdONmsyczVjN2lUTVRNZ3VqUEFrIiwiZW5kcG9pbnQiOiJodHRwczovL2ZhYnJpYy53ZWJwYS5jb21jYXN0Lm5ldDo4MDgwLyJ9.ahYvcvZxKfKt-enfMZOT9JwCr7eGECv2fUYEDbVdm\"\n"
+	"\"02:X1Jq1iPnD8MqkSOyHUQ8a17DOFQSmv8C3ZTKkjtFHEUR8l-KYhaA8bmU7Fzo8m0f4Ub411p4r4VE3KOdv8TWbKgKKIElONJmimpCDvHaUG6SZTaGB_proHyw5Vy5RzK4EAUc0C36hPBF6pIQfl5DgT1I66MHDcklMx2af2_F26Wv4rRX3pU_Q6fvustJhRTBcCJa7S6NZrm_Ca9rkRk5v2dyXkzrrB0_PCIoHITom8DPF8N56EDGzLyY25-\"\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"
+	"\"03:ji81f9B4vnaENEZJgPzYiYdVLvbkgg9rbI7RVcEjutIszb7XZA\"\n"
+	"\"03:ji81f9B4vnaENEZJgPzYiYdVLvbkgg9rbI7RVcEjutIszb7XZA\"\n"
+	"\"01:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1MTQ3NjQ3OTksImlzcyI6IlNIQTI1NjpqZGNSeXNGdW5XVUFUODUyaHVRb0lNOUdONmsyczVjN2lUTVRNZ3VqUEFrIiwiZW5kcG9pbnQiOiJodHRwczovL2ZhYnJpYy53ZWJwYS5jb21jYXN0Lm5ldDo4MDgwLyJ9.ahYvcvZxKfKt-enfMZOT9JwCr7eGECv2fUYEDbVdm\"\n"
+	"\"02:X1Jq1iPnD8MqkSOyHUQ8a17DOFQSmv8C3ZTKkjtFHEUR8l-KYhaA8bmU7Fzo8m0f4Ub411p4r4VE3KOdv8TWbKgKKIElONJmimpCDvHaUG6SZTaGB_proHyw5Vy5RzK4EAUc0C36hPBF6pIQfl5DgT1I66MHDcklMx2af2_F26Wv4rRX3pU_Q6fvustJhRTBcCJa7S6NZrm_Ca9rkRk5v2dyXkzrrB0_PCIoHITom8DPF8N56EDGzLyY25-\"\n"
 ;

 const char *dns_recs_err5 = // missing rec 1
-	"\"03:iJmBr4pGROCCbRlbL3GpGDcSFJcaqBQFOriTRk0xKQ\"\n"
+	"\"03:ji81f9B4vnaENEZJgPzYiYdVLvbkgg9rbI7RVcEjutIszb7XZA\"\n"
 	"\n" // non-txt record type
-	"\"02:EXGyJQXrxMYuepAiFPT0sWxvydHvZKxcx7S5MCmlOhRpWZRrzgFceNWMwFcRPAPxovOoc4aYvx2DqGMdckmAD1q3y3Gjjw1qyxd4503jmrXKfjrdW3eFZD_Q454iRVf4c0CMWA5tl0ElOlX9u_HC3G_dPiKGUBU5PpWONgHpg2-ewrQcUe4-J4hBQmqZmRSB9n-6zB1XD80cDQO7aHeJ9aysJS1vgmwaSuT9y6PhPsp05NUC0TDzZVJUX\"\n"
+	"\"02:X1Jq1iPnD8MqkSOyHUQ8a17DOFQSmv8C3ZTKkjtFHEUR8l-KYhaA8bmU7Fzo8m0f4Ub411p4r4VE3KOdv8TWbKgKKIElONJmimpCDvHaUG6SZTaGB_proHyw5Vy5RzK4EAUc0C36hPBF6pIQfl5DgT1I66MHDcklMx2af2_F26Wv4rRX3pU_Q6fvustJhRTBcCJa7S6NZrm_Ca9rkRk5v2dyXkzrrB0_PCIoHITom8DPF8N56EDGzLyY25-\"\n"
 ;

 cjwt_t jwt1;	// secure, payload good
@@ -144,7 +123,7 @@ 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 int analyze_jwt (const cjwt_t *jwt);
 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);
@@ -158,17 +137,6 @@ 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);

-void addCRUDmsgToQueue(wrp_msg_t *crudMsg)
-{
-	(void)crudMsg;
-	return;
-}
-
-void *CRUDHandlerTask()
-{
-	return NULL;
-}
-
 int setup_test_jwts (void)
 {
 	memset (&jwt1, 0, sizeof(cjwt_t));
@@ -214,8 +182,8 @@ static int get_dns_text (const char *dns_rec_id, u_char *nsbuf, int bufsize)
 		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, ".fabric.") != NULL)
+		rec = dns_recs_fabric;
 	else if (strstr (dns_rec_id, ".err1.") != NULL)
 		rec = dns_recs_err1;
 	else if (strstr (dns_rec_id, ".err2.") != NULL)
@@ -236,9 +204,6 @@ static int get_dns_text (const char *dns_rec_id, u_char *nsbuf, int bufsize)
 /*                                   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);
@@ -283,14 +248,12 @@ int ns_parserr(ns_msg *msg_handle, ns_sect sect, int rec, ns_rr *rr)
 		ptr += (l+1);
 	}

-	l = strlen(ptr);
-	if (l == 0) {
+	if (strlen (ptr) == 0) {
 		rr->type = ns_t_key;
 	} else {
 		rr->type = ns_t_txt;
 	}
 	rr->rdata = (u_char *) ptr;
-	rr->rdlength = l; 
 	return 0;
 }

@@ -319,34 +282,26 @@ void		__res_nclose (res_state 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);
+	ret = analyze_jwt (&jwt1);
 	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);
+	ret = analyze_jwt (&jwt2);
 	assert_int_equal (ret, TOKEN_ERR_JWT_EXPIRED);
-	ret = analyze_jwt (&jwt3, &server_Address, &port);
+	ret = analyze_jwt (&jwt3);
 	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);
+	ret = analyze_jwt (&jwt4);
 	assert_int_equal (ret, TOKEN_ERR_INVALID_JWT_CONTENT);
+
 }

 void test_validate_algo ()
 {
 	bool ret;
 	ParodusCfg cfg;
-	cfg.jwt_algo = 1025;
+	parStrncpy (cfg.jwt_algo, "none:RS256", sizeof(cfg.jwt_algo));
 	set_parodus_cfg (&cfg);
 	jwt1.header.alg = alg_rs256;
 	ret = validate_algo (&jwt1);
@@ -398,14 +353,12 @@ void test_strip_rrdata ()
 	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) {
@@ -491,7 +444,7 @@ void test_get_rr_seq_table()
 		assert_int_equal (ret, 0);
 	}

-	ret = get_dns_text (".test2.", nsbuf, 4096);
+	ret = get_dns_text (".fabric.", nsbuf, 4096);
 	assert_int_equal (ret, 0);
 	ns_initparse (nsbuf, 4096, &msg_handle);
 	assert_int_equal (msg_handle._counts[ns_s_an],  1);
@@ -499,9 +452,9 @@ void test_get_rr_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]);
+		int len = strlen (rr_recs_fabric[0]);
 		assert_int_equal (len, seq_table[0].rr_len);
-		ret = strncmp (seq_table[0].rr_ptr, rr_recs2_test[0], len);
+		ret = strncmp (seq_table[0].rr_ptr, rr_recs_fabric[0], len);
 		assert_int_equal (ret, 0);
 	}

@@ -613,57 +566,53 @@ void test_query_dns ()
 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;
+	parStrncpy (cfg->dns_txt_url, "test", sizeof(cfg->dns_txt_url));
+	parStrncpy (cfg->jwt_algo, "none:RS256", sizeof(cfg->jwt_algo));

-	read_key_from_file ("../../tests/pubkey4.pem", cfg->jwt_key, 4096);
+	read_key_from_file ("../../tests/webpa-rs256.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);
+	insecure = allow_insecure_conn ();
 	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));
+	parStrncpy (cfg->dns_txt_url, "err5", 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);
+	insecure = allow_insecure_conn ();
 	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->dns_txt_url, "test", sizeof(cfg->dns_txt_url));
+	parStrncpy (cfg->jwt_algo, "none:RS256", sizeof(cfg->jwt_algo));
 	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);
+	insecure = allow_insecure_conn ();
 	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);
+	parStrncpy (cfg->dns_txt_url, "test", sizeof(cfg->dns_txt_url));
+	parStrncpy (cfg->jwt_algo, "none:RS512", sizeof(cfg->jwt_algo));
+	read_key_from_file ("../../tests/webpa-rs256.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);
+	insecure = allow_insecure_conn ();
 	assert_int_equal (insecure, TOKEN_ERR_ALGO_NOT_ALLOWED);

 }
@@ -695,11 +644,11 @@ void test_get_algo_mask ()
 {
 	unsigned mask;

-	mask = get_algo_mask ("rs256");
-	assert_int_equal ((int) mask, 1024);
+	mask = get_algo_mask ("none");
+	assert_int_equal ((int) mask, 1);

-	mask = get_algo_mask ("rs512:rs256");
-	assert_int_equal ((int) mask, 5120);
+	mask = get_algo_mask ("none:rs256");
+	assert_int_equal ((int) mask, 1025);
 }

 /*----------------------------------------------------------------------------*/
@@ -719,7 +668,7 @@ int main(void)
 	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_allow_insecure_conn),
        cmocka_unit_test(test_get_tok),
        cmocka_unit_test(test_get_algo_mask),
    };
--- a/tests/test_token_stub.c
+++ b/tests/test_token_stub.c
@@ -22,7 +22,6 @@
 #include <setjmp.h>
 #include <cmocka.h>
 #include <assert.h>
-#include <wrp-c.h>

 #include "../src/token.h"

@@ -31,24 +30,11 @@
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/

-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);
+	insecure = allow_insecure_conn ();
+	assert_int_equal (insecure, 1);
 }

 /*----------------------------------------------------------------------------*/
--- a/tests/test_upstream.c
+++ b/tests/test_upstream.c
@@ -31,7 +31,6 @@
 #include "../src/client_list.h"
 #include "../src/ParodusInternal.h"
 #include "../src/partners_check.h"
-#include "../src/close_retry.h"

 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
@@ -43,9 +42,6 @@ extern size_t metaPackSize;
 extern UpStreamMsg *UpStreamMsgQ;
 int numLoops = 1;
 wrp_msg_t *temp = NULL;
-extern pthread_mutex_t nano_mut;
-extern pthread_cond_t nano_con;
-static int crud_test = 0;
 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/
@@ -71,21 +67,6 @@ 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;
@@ -160,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();
 }

@@ -311,42 +280,10 @@ 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);
-
-    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);
+    will_return(nn_freemsg,1);
    expect_function_call(nn_freemsg);
-    expect_function_call(wrp_free_struct);

    processUpstreamMessage();
    free(temp);
@@ -380,9 +317,10 @@ 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);
@@ -437,9 +375,10 @@ 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);
@@ -478,9 +417,10 @@ void test_processUpstreamMessageRegMsgNoClients()

    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);
@@ -509,11 +449,12 @@ 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);
@@ -534,9 +475,10 @@ 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);
@@ -596,9 +538,10 @@ 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);
@@ -625,144 +568,12 @@ void test_sendUpstreamMsgToServer()
    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()
 {
    metaPackSize = 0;
    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;
-}
-
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
@@ -777,7 +588,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),
@@ -786,15 +596,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),
    };

    return cmocka_run_group_tests(tests, NULL, NULL);
Author	SHA1	Message	Date
Shilpa Seshadri	bf342a6983	Clear auth token if fetch fails	2019-05-21 18:31:03 -07:00
Weston Schmidt	0910dfa11e	Merge pull request #239 from gbuddappagari/boot_time_fix Handle unknown and * partner_id in parodus	2018-09-10 09:55:06 -07:00
Gayathri	1b007fe3bb	Handle unknown and * partner_id in parodus	2018-09-10 16:23:28 +05:30
Shilpa Seshadri	a252447494	Modify nopoll git tag as appropriate	2018-08-27 23:30:04 -07:00
Gayathri	7f4b6e3f9e	Modified validation logic for boot-time (cherry picked from commit `844a1d925a`) Conflicts: src/config.c src/config.h	2018-08-27 23:18:53 -07:00