"Parodus crash due to invalid serial number"

2026-01-27 18:20:04 +00:00 · 2022-07-30 00:47:13 +05:30
40 changed files with 159 additions and 2547 deletions
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -39,9 +39,9 @@ jobs:
        run: mkdir build

      - name: Get Sonarcloud Binaries
-        uses: xmidt-org/sonarcloud-installer-action@v1
-        with:
-          working-directory: build
+        working-directory: build
+        run: |
+          ../.github/scripts/get_sonarcloud.sh

      - name: CMake
        working-directory: build
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,10 +44,12 @@ include_directories(${INCLUDE_DIR}
 					)	

 if (ENABLE_WEBCFGBIN)
-include_directories(${INCLUDE_DIR}/rbus)
+include_directories(${INCLUDE_DIR}/rbus
+		    ${INCLUDE_DIR}/rbus-core
+		    ${INCLUDE_DIR}/rtmessage
+)
 endif (ENABLE_WEBCFGBIN)

-
 # Get git commit hash 
 #-------------------------------------------------------------------------------
 execute_process(
@@ -64,18 +66,9 @@ add_definitions("-DGIT_COMMIT_TAG=\"${GIT_COMMIT_TAG}\"")
 add_definitions(-std=c99)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE -DNOPOLL_LOGGER ")

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

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

 # pthread external dependency
 #-------------------------------------------------------------------------------
@@ -179,8 +172,8 @@ add_dependencies(libcimplog cimplog)
 ExternalProject_Add(wrp-c
 	DEPENDS trower-base64 msgpack cimplog
    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/wrp-c
-    GIT_REPOSITORY https://github.com/xmidt-org/wrp-c.git
-    GIT_TAG "b5ef4d10cb39905908788bc89ab3e4dab201db8a"
+    GIT_REPOSITORY https://github.com/Comcast/wrp-c.git
+    GIT_TAG "1.0.1"
    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
                  -DMSGPACK_ENABLE_CXX=OFF
                  -DMSGPACK_BUILD_EXAMPLES=OFF
@@ -244,21 +237,46 @@ include_directories(${INCLUDE_DIR}
 endif (FEATURE_DNS_QUERY)

 if (ENABLE_WEBCFGBIN)
+# rtMessage external dependency
+#-------------------------------------------------------------------------------
+ExternalProject_Add(rtMessage
+     #DEPENDS cJSON
+     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/rtMessage
+     GIT_REPOSITORY https://github.com/rdkcmf/rdk-rtmessage.git
+     GIT_TAG rdk-next
+     CMAKE_ARGS += -DBUILD_RTMESSAGE_LIB=ON
+                   -DBUILD_RTMESSAGE_SAMPLE_APP=ON
+                   -DBUILD_FOR_DESKTOP=OFF
+		   -DCJSON_BUILD=OFF
+                   -DBUILD_DATAPROVIDER_LIB=ON
+                   -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_TESTING=OFF
+)
+add_library(librtMessage STATIC SHARED IMPORTED)
+add_dependencies(librtMessage rtMessage)
+
+# rbus-core external dependency
+#-------------------------------------------------------------------------------
+ExternalProject_Add(rbus-core
+     DEPENDS rtMessage
+     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/rbus-core
+     GIT_REPOSITORY https://github.com/rdkcmf/rbuscore.git
+     GIT_TAG rdk-next
+     CMAKE_ARGS += -DBUILD_FOR_DESKTOP=ON -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
+                   -DBUILD_TESTING=OFF
+)
+add_library(librbus-core STATIC SHARED IMPORTED)
+add_dependencies(librbus-core rbus-core)
+
 # rbus external dependency
 #-------------------------------------------------------------------------------
 ExternalProject_Add(rbus
+     DEPENDS rtMessage rbus-core
     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/rbus
-     GIT_REPOSITORY https://github.com/rdkcentral/rbus.git
-     GIT_TAG main
+     GIT_REPOSITORY https://github.com/rdkcmf/rbus.git
+     GIT_TAG rdk-next
     CMAKE_ARGS += -DBUILD_FOR_DESKTOP=ON -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_TESTING=OFF
 )

-add_library(librbuscore STATIC SHARED IMPORTED)
-add_dependencies(librbuscore rbuscore)
-
-add_library(librtMessage STATIC SHARED IMPORTED)
-add_dependencies(librtMessage rtMessage)
-
 add_library(librbus STATIC SHARED IMPORTED)
 add_dependencies(librbus rbus)
 endif (ENABLE_WEBCFGBIN)
@@ -291,10 +309,6 @@ if (ENABLE_WEBCFGBIN)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_WEBCFGBIN ")
 endif (ENABLE_WEBCFGBIN)

-if (WAN_FAILOVER_SUPPORTED)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWAN_FAILOVER_SUPPORTED ")
-endif (WAN_FAILOVER_SUPPORTED)
-
 link_directories ( ${LIBRARY_DIR} ${COMMON_LIBRARY_DIR} ${LIBRARY_DIR64} )
 add_subdirectory(src)
 if (BUILD_TESTING)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,15 +24,9 @@ set(SOURCES ${SOURCES} seshat_interface_stub.c)
 endif (ENABLE_SESHAT)

 if (ENABLE_WEBCFGBIN)
-set(SOURCES ${SOURCES} upstream_rbus.c xmidtsend_rbus.c)
+set(SOURCES ${SOURCES} upstream_rbus.c)
 endif (ENABLE_WEBCFGBIN)

-if (WAN_FAILOVER_SUPPORTED)
-message(STATUS "WAN_FAILOVER_SUPPORTED is supported")
-else()
-message(STATUS "WAN_FAILOVER_SUPPORTED is not supported")
-endif (WAN_FAILOVER_SUPPORTED)
-
 add_executable(parodus ${SOURCES})

 target_link_libraries (parodus
@@ -63,6 +57,6 @@ target_link_libraries (parodus -llibseshat)
 endif (ENABLE_SESHAT)

 if (ENABLE_WEBCFGBIN)
-target_link_libraries (parodus -lrbus)
+target_link_libraries (parodus -lrbus -lrbus-core)
 endif (ENABLE_WEBCFGBIN)
 install (TARGETS parodus DESTINATION bin)
--- a/src/ParodusInternal.c
+++ b/src/ParodusInternal.c
@@ -69,9 +69,9 @@ char* getWebpaConveyHeader()
        cJSON_AddStringToObject(response, WEBPA_PROTOCOL, get_parodus_cfg()->webpa_protocol);
    }

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

    if(strlen(get_parodus_cfg()->hw_last_reboot_reason)!=0)
--- a/src/ParodusInternal.h
+++ b/src/ParodusInternal.h
@@ -163,11 +163,6 @@ void timespec_diff(struct timespec *start, struct timespec *stop,

 #ifdef ENABLE_WEBCFGBIN
 void subscribeRBUSevent();
-int regXmidtSendDataMethod();
-void registerRbusLogger();
-#endif
-#ifdef WAN_FAILOVER_SUPPORTED
-void setWebpaInterface(char *value);
 #endif
 /*------------------------------------------------------------------------------*/
 /*                        For interface_down_event Flag                         */
@@ -185,12 +180,7 @@ void set_interface_down_event();
 pthread_cond_t *get_interface_down_con();

 pthread_mutex_t *get_interface_down_mut();
-
-pthread_cond_t *get_global_cloud_status_cond(void);
-
-pthread_mutex_t *get_global_cloud_status_mut(void);
-
-int cloud_status_is_online (void);
+  

 #ifdef __cplusplus
 }
--- a/src/auth_token.c
+++ b/src/auth_token.c
@@ -64,7 +64,6 @@ int requestNewAuthToken(char *newToken, size_t len, int r_count)
 	struct curl_slist *list = NULL;
 	struct curl_slist *headers_list = NULL;

-	char webpa_interface[64]={'\0'};
 	double total;

 	struct token_data data;
@@ -81,10 +80,9 @@ int requestNewAuthToken(char *newToken, size_t len, int r_count)
 		curl_easy_setopt(curl, CURLOPT_URL, get_parodus_cfg()->token_server_url);
 		curl_easy_setopt(curl, CURLOPT_TIMEOUT, CURL_TIMEOUT_SEC);

-		parStrncpy(webpa_interface, getWebpaInterface(), sizeof(webpa_interface));
-		if(webpa_interface !=NULL && strlen(webpa_interface) >0)
+		if(get_parodus_cfg()->webpa_interface_used !=NULL && strlen(get_parodus_cfg()->webpa_interface_used) >0)
 		{
-			curl_easy_setopt(curl, CURLOPT_INTERFACE, webpa_interface);
+			curl_easy_setopt(curl, CURLOPT_INTERFACE, get_parodus_cfg()->webpa_interface_used);
 		}
 		/* set callback for writing received data */
 		curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback_fn);
@@ -223,14 +221,8 @@ void getAuthToken(ParodusCfg *cfg)
 * @param[in] nmemb size of delivered data
 * @param[out] data curl response data saved.
 */
-#ifndef DEVICE_CAMERA
 size_t write_callback_fn(void *buffer, size_t size, size_t nmemb, struct token_data *data)
 {
-#else
-size_t write_callback_fn(void *buffer, size_t size, size_t nmemb, void *datain)
-{
-    struct token_data *data = (struct token_data*) datain;
-#endif //DEVICE_CAMERA
    ParodusCfg *cfg;
    size_t max_data_size = sizeof (cfg->webpa_auth_token);
    size_t index = data->size;
@@ -312,7 +304,7 @@ void createCurlheader(struct curl_slist *list, struct curl_slist **header_list)
    snprintf(buf, MAX_BUF_SIZE, "X-Midt-Protocol: %s", get_parodus_cfg()->webpa_protocol);
    list = curl_slist_append(list, buf);

-    snprintf(buf, MAX_BUF_SIZE, "X-Midt-Interface-Used: %s", getWebpaInterface());
+    snprintf(buf, MAX_BUF_SIZE, "X-Midt-Interface-Used: %s", get_parodus_cfg()->webpa_interface_used);
    list = curl_slist_append(list, buf);

    snprintf(buf, MAX_BUF_SIZE, "X-Midt-Last-Reboot-Reason: %s", get_parodus_cfg()->hw_last_reboot_reason);
--- a/src/auth_token.h
+++ b/src/auth_token.h
@@ -47,11 +47,7 @@ struct token_data {

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

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

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

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

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

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

@@ -435,9 +387,6 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
        {"webpa-backoff-max",       required_argument, 0, 'o'},
        {"webpa-interface-used",    required_argument, 0, 'i'},
        {"parodus-local-url",       required_argument, 0, 'l'},
-#ifdef ENABLE_WEBCFGBIN
-	{"max-queue-size",          required_argument, 0, 'q'},
-#endif	
        {"partner-id",              required_argument, 0, 'p'},
 #ifdef ENABLE_SESHAT
        {"seshat-url",              required_argument, 0, 'e'},
@@ -485,7 +434,7 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
      /* getopt_long stores the option index here. */
      int option_index = 0;
      c = getopt_long (argc, argv, 
-			"m:s:f:d:r:n:b:u:t:o:i:l:q:p:e:D:j:a:k:c:T:w:J:46:C:S:R:K:M",
+			"m:s:f:d:r:n:b:u:t:o:i:l:p:e:D:j:a:k:c:T:w:J:46:C:S:R:K:M",
 			long_options, &option_index);

      /* Detect the end of the options. */
@@ -501,7 +450,7 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
        
        case 's':
 	if(parse_serial_num(cfg->hw_serial_number, optarg) == 0)
-            ParodusInfo ("hw_serial_number is %s\n",cfg->hw_serial_number);
+            ParodusInfo ("hw_serial-number is %s\n",cfg->hw_serial_number);
          break;

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

-void free_cfg(ParodusCfg *cfg)
-{
-    if(cfg != NULL)
-    {
-	    if (cfg->mtls_client_cert_path != NULL )
-	    {
-		 free(cfg->mtls_client_cert_path);
-		 cfg->mtls_client_cert_path = NULL;
-	    }
-	    if(cfg->connection_health_file != NULL)
-	    {
-		free(cfg->connection_health_file);
-		cfg->connection_health_file = NULL;
-	    }
-	    if(cfg->token_server_url != NULL)
-	    {
-		free(cfg->token_server_url );
-		cfg->token_server_url = NULL;
-	    }
-	    if(cfg->mtls_client_key_path != NULL)
-	    {
-		free(cfg->mtls_client_key_path);
-		cfg->mtls_client_key_path = NULL;
-	    }
-	    if(cfg->client_cert_path != NULL)
-	    {
-		free(cfg->client_cert_path);
-		cfg->client_cert_path = NULL;
-	    }
-	    if(cfg->crud_config_file != NULL)
-	    {
-		free(cfg->crud_config_file);
-		cfg->crud_config_file = NULL;
-	    }
-	    if(cfg->close_reason_file != NULL)
-	    {
-		free(cfg->close_reason_file);
-		cfg->close_reason_file = NULL;
-	    }
-	    if(cfg->cloud_disconnect != NULL)
-	    {
-		free(cfg->cloud_disconnect);
-		cfg->cloud_disconnect = NULL;
-	    }
-    }
-}
-
 void setDefaultValuesToCfg(ParodusCfg *cfg)
 {
    if(cfg == NULL)
@@ -864,7 +756,7 @@ void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg)
    }
    if(strlen(config->webpa_interface_used )!=0)
    {
-        parStrncpy(getWebpaInterface(), config->webpa_interface_used,sizeof(getWebpaInterface()));
+        parStrncpy(cfg->webpa_interface_used, config->webpa_interface_used,sizeof(cfg->webpa_interface_used));
    }
    else
    {
@@ -932,9 +824,7 @@ void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg)
        parStrncpy(cfg->cert_path, "\0", sizeof(cfg->cert_path));
        ParodusPrint("cert_path is NULL. set to empty\n");
    }
-    #ifdef ENABLE_WEBCFGBIN
-        cfg->max_queue_size =  config->max_queue_size;
-    #endif
+
    cfg->boot_time = config->boot_time;
    cfg->webpa_ping_timeout = config->webpa_ping_timeout;
    cfg->webpa_backoff_max = config->webpa_backoff_max;
@@ -990,26 +880,4 @@ void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg)
    }
 }

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

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

-#include <pthread.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -88,9 +87,6 @@ typedef struct
    char webpa_uuid[64];
    unsigned int flags;
    char local_url[124];
-#ifdef ENABLE_WEBCFGBIN
-    unsigned int max_queue_size;
-#endif    
    char partner_id[64];
 #ifdef ENABLE_SESHAT
    char seshat_url[128];
@@ -135,7 +131,7 @@ void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg);
 *    or -1 if error
 */ 
 int parseCommandLine(int argc,char **argv,ParodusCfg * cfg);
-void free_cfg(ParodusCfg *cfg);
+
 void setDefaultValuesToCfg(ParodusCfg *cfg); 
 // Accessor for the global config structure.
 ParodusCfg *get_parodus_cfg(void);
@@ -143,10 +139,6 @@ void set_parodus_cfg(ParodusCfg *);
 char *get_token_application(void) ;
 void set_cloud_disconnect_reason(ParodusCfg *cfg, char *disconn_reason);
 void reset_cloud_disconnect_reason(ParodusCfg *cfg);
-char *getWebpaInterface(void);
-void set_cloud_status(char *status);
-char *get_cloud_status(void);
-int get_parodus_init();
 /**
 * parse a webpa url. Extract the server address, the port
 * and return whether it's secure or not
--- a/src/conn_interface.c
+++ b/src/conn_interface.c
@@ -99,9 +99,7 @@ void createSocketConnection(void (* initKeypress)())
    #endif

    EventHandler();
-    #ifdef WAN_FAILOVER_SUPPORTED
-    subscribeCurrentActiveInterfaceEvent();
-    #endif
+    
    set_server_list_null (&server_list);
    create_conn_rtn = createNopollConnection(ctx, &server_list);
    if(!create_conn_rtn)
@@ -115,6 +113,9 @@ void createSocketConnection(void (* initKeypress)())
    UpStreamMsgQ = NULL;
    StartThread(handle_upstream, &upstream_tid);
    StartThread(processUpstreamMessage, &upstream_msg_tid);
+    #ifdef ENABLE_WEBCFGBIN
+    subscribeRBUSevent();
+    #endif 
    ParodusMsgQ = NULL;
    StartThread(messageHandlerTask, &downstream_tid);
    StartThread(serviceAliveTask, &svc_alive_tid);
@@ -231,9 +232,6 @@ void createSocketConnection(void (* initKeypress)())
    nopoll_ctx_unref(ctx);
    nopoll_cleanup_library();
    curl_global_cleanup();
-    clear_metadata();
-    rdk_logger_deinit();
-    free_server_list(&server_list);
 }

 void shutdownSocketConnection(char *reason) {
--- a/src/connection.c
+++ b/src/connection.c
@@ -132,10 +132,7 @@ void set_cloud_disconnect_time(int disconnTime)
    cloud_disconnect_max_time = disconnTime;
 }

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

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

@@ -325,14 +322,8 @@ static int backoff_delay (backoff_timer_t *timer)
  struct timespec ts;
  int rtn;

-  pthread_condattr_t backoff_delay_cond_attr;
-
-  pthread_condattr_init (&backoff_delay_cond_attr);
-  pthread_condattr_setclock (&backoff_delay_cond_attr, CLOCK_MONOTONIC);
-  pthread_cond_init (&backoff_delay_con, &backoff_delay_cond_attr);
-
  // periodically update the health file.
-  clock_gettime (CLOCK_MONOTONIC, &ts);
+  clock_gettime (CLOCK_REALTIME, &ts);
  if ((ts.tv_sec - timer->ts.tv_sec) >= UPDATE_HEALTH_FILE_INTERVAL_SECS) {
    start_conn_in_progress (timer->start_time);
    timer->ts.tv_sec += UPDATE_HEALTH_FILE_INTERVAL_SECS;
@@ -345,8 +336,6 @@ static int backoff_delay (backoff_timer_t *timer)
  rtn = pthread_cond_timedwait (&backoff_delay_con, &backoff_delay_mut, &ts);
  pthread_mutex_unlock (&backoff_delay_mut);

-  pthread_condattr_destroy(&backoff_delay_cond_attr);
-
  if (g_shutdown)
    return BACKOFF_SHUTDOWN;
  if ((rtn != 0) && (rtn != ETIMEDOUT)) {
@@ -728,9 +717,10 @@ int createNopollConnection(noPollCtx *ctx, server_list_t *server_list)
 {
  create_connection_ctx_t conn_ctx;
  int max_retry_count;
+  struct timespec connect_time,*connectTimePtr;
+  connectTimePtr = &connect_time;
  backoff_timer_t backoff_timer;
  static int init_conn_failure=1;
-  struct sysinfo l_sSysInfo;
  
  if(ctx == NULL) {
        return nopoll_false;
@@ -783,7 +773,8 @@ int createNopollConnection(noPollCtx *ctx, server_list_t *server_list)
 	    }
 #endif		
 	}
-	if(conn_ctx.current_server != NULL && conn_ctx.current_server->allow_insecure <= 0)
+      
+	if(conn_ctx.current_server->allow_insecure <= 0)
 	{
 		ParodusInfo("Connected to server over SSL\n");
 		OnboardLog("Connected to server over SSL\n");
@@ -793,6 +784,9 @@ int createNopollConnection(noPollCtx *ctx, server_list_t *server_list)
 		ParodusInfo("Connected to server\n");
 		OnboardLog("Connected to server\n");
 	}
+	
+	get_parodus_cfg()->cloud_status = CLOUD_STATUS_ONLINE;
+	ParodusInfo("cloud_status set as %s after successful connection\n", get_parodus_cfg()->cloud_status);

 	/* On initial connect success, invoke conn status change event as "success" */
 	if((NULL != on_conn_status_change) && init)
@@ -806,9 +800,9 @@ int createNopollConnection(noPollCtx *ctx, server_list_t *server_list)
 		on_ping_status_change("received");
 	}

-	if(init) {
-		sysinfo(&l_sSysInfo);
-		ParodusInfo("connect_time-diff-boot_time=%ld\n", l_sSysInfo.uptime);
+	if((get_parodus_cfg()->boot_time != 0) && init) {
+		getCurrentTime(connectTimePtr);
+		ParodusInfo("connect_time-diff-boot_time=%d\n", connectTimePtr->tv_sec - get_parodus_cfg()->boot_time);
 		init = 0; //set init to 0 so that this is logged only during process start up and not during reconnect
 	}

@@ -824,9 +818,6 @@ int createNopollConnection(noPollCtx *ctx, server_list_t *server_list)
 	ParodusPrint("LastReasonStatus reset after successful connection\n");
 	setMessageHandlers();
    stop_conn_in_progress ();
-	ParodusPrint("set cloud_status\n");
-	set_cloud_status(CLOUD_STATUS_ONLINE);
-	ParodusInfo("cloud_status set as %s after successful connection\n", get_cloud_status());
 	return nopoll_true;
 }          

@@ -871,7 +862,7 @@ static noPollConnOpts * createConnOpts (char * extra_headers, bool secure)
 	    nopoll_conn_opts_ssl_peer_verify (opts, nopoll_true);
 	    nopoll_conn_opts_set_ssl_protocol (opts, NOPOLL_METHOD_TLSV1_2);
 	}
-	nopoll_conn_opts_set_interface (opts,getWebpaInterface());	
+	nopoll_conn_opts_set_interface (opts,get_parodus_cfg()->webpa_interface_used);	
 	nopoll_conn_opts_set_extra_headers (opts,extra_headers); 
 	return opts;   
 }
@@ -911,8 +902,8 @@ void close_and_unref_connection(noPollConn *conn, bool is_shutting_down)
 {
    if (conn) {
      close_conn (conn, is_shutting_down);
-      set_cloud_status(CLOUD_STATUS_OFFLINE);
-      ParodusInfo("cloud_status set as %s after connection close\n", get_cloud_status());
+      get_parodus_cfg()->cloud_status = CLOUD_STATUS_OFFLINE;
+      ParodusInfo("cloud_status set as %s after connection close\n", get_parodus_cfg()->cloud_status);
    }
 }

--- a/src/crud_internal.c
+++ b/src/crud_internal.c
@@ -537,13 +537,13 @@ int retrieveFromMemory(char *keyName, cJSON **jsonresponse)
 	}
 	else if(strcmp(WEBPA_INTERFACE, keyName)==0)
 	{
-		if((getWebpaInterface() !=NULL)&& (strlen(get_parodus_cfg()->fw_name)==0))
+		if((get_parodus_cfg()->webpa_interface_used !=NULL)&& (strlen(get_parodus_cfg()->fw_name)==0))
 		{
 			ParodusError("retrieveFromMemory: webpa_interface_used value is NULL\n");
 			return -1;
 		}
-		ParodusInfo("retrieveFromMemory: keyName:%s value:%s\n",keyName,getWebpaInterface());
-		cJSON_AddItemToObject( *jsonresponse, WEBPA_INTERFACE , cJSON_CreateString(getWebpaInterface()));
+		ParodusInfo("retrieveFromMemory: keyName:%s value:%s\n",keyName,get_parodus_cfg()->webpa_interface_used);
+		cJSON_AddItemToObject( *jsonresponse, WEBPA_INTERFACE , cJSON_CreateString(get_parodus_cfg()->webpa_interface_used));
 	}
 	else if(strcmp(WEBPA_URL, keyName)==0)
 	{
@@ -577,20 +577,20 @@ int retrieveFromMemory(char *keyName, cJSON **jsonresponse)
 	}
 	else if(strcmp(CLOUD_STATUS, keyName)==0)
 	{
-		if(get_cloud_status() ==NULL)
+		if(get_parodus_cfg()->cloud_status ==NULL)
 		{
 			ParodusError("retrieveFromMemory: cloud_status value is NULL\n");
 			return -1;
 		}
-		else if((get_cloud_status() !=NULL) && (strlen(get_cloud_status())==0))
+		else if((get_parodus_cfg()->cloud_status !=NULL) && (strlen(get_parodus_cfg()->cloud_status)==0))
 		{
 			ParodusError("retrieveFromMemory: cloud_status value is empty\n");
 			return -1;
 		}
 		else
 		{
-			ParodusInfo("retrieveFromMemory: keyName:%s value:%s\n", keyName, get_cloud_status());
-			cJSON_AddItemToObject( *jsonresponse, CLOUD_STATUS , cJSON_CreateString(get_cloud_status()));
+			ParodusInfo("retrieveFromMemory: keyName:%s value:%s\n", keyName, get_parodus_cfg()->cloud_status);
+			cJSON_AddItemToObject( *jsonresponse, CLOUD_STATUS , cJSON_CreateString(get_parodus_cfg()->cloud_status));
 		}
 	}
 	else if(strcmp(BOOT_TIME, keyName)==0)
--- a/src/downstream.c
+++ b/src/downstream.c
@@ -27,9 +27,6 @@
 #include "partners_check.h"
 #include "ParodusInternal.h"
 #include "crud_interface.h"
-#ifdef ENABLE_WEBCFGBIN
-#include "xmidtsend_rbus.h"
-#endif
 /*----------------------------------------------------------------------------*/
 /*                             Function Prototypes                            */
 /*----------------------------------------------------------------------------*/
@@ -94,7 +91,6 @@ void listenerOnMessage(void * msg, size_t msgSize)
                {
                    ParodusPrint("numOfClients registered is %d\n", get_numOfClients());
                    int ret = validate_partner_id(message, NULL);
-		    ParodusPrint("validate_partner_id returns %d\n", ret);
                    if(ret < 0)
                    {
                        response = cJSON_CreateObject();
@@ -102,6 +98,7 @@ void listenerOnMessage(void * msg, size_t msgSize)
                        cJSON_AddStringToObject(response, "message", "Invalid partner_id");
                    } 

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

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

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

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

--- a/src/heartBeat.c
+++ b/src/heartBeat.c
@@ -22,15 +22,12 @@
 */

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

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

 pthread_mutex_t heartBeat_mut=PTHREAD_MUTEX_INITIALIZER;
-pthread_mutex_t ping_mut=PTHREAD_MUTEX_INITIALIZER;

 // Get value of heartBeatTimer
 unsigned int get_heartBeatTimer() 
@@ -76,22 +73,5 @@ void resume_heartBeatTimer()
 	pthread_mutex_unlock (&heartBeat_mut);
 }

-// Set ping received timeStamp
-void set_pingTimeStamp()
-{
-	struct timespec ts;
-	getCurrentTime(&ts);
-	pthread_mutex_lock (&ping_mut);
-	pingTimeStamp = (long long)ts.tv_sec;
-	pthread_mutex_unlock (&ping_mut);
-}

-// Get ping received timeStamp
-long long get_pingTimeStamp()
-{
-	long long tmp = 0;
-	pthread_mutex_lock (&ping_mut);
-	tmp = pingTimeStamp;
-	pthread_mutex_unlock (&ping_mut);
-	return tmp;
-}
+
--- a/src/heartBeat.h
+++ b/src/heartBeat.h
@@ -45,10 +45,6 @@ void pause_heartBeatTimer();
 // Resume heartBeatTimer, i.e. resume incrementing
 void resume_heartBeatTimer();

-void set_pingTimeStamp();
-
-long long get_pingTimeStamp();
-
 #ifdef __cplusplus
 }
 #endif
--- a/src/main.c
+++ b/src/main.c
@@ -24,11 +24,7 @@
 #include "parodus_log.h"
 #include <curl/curl.h>
 #ifdef INCLUDE_BREAKPAD
-#ifndef DEVICE_CAMERA
 #include "breakpad_wrapper.h"
-#else
-#include "breakpadwrap.h"
-#endif  //DEVICE_CAMERA
 #endif
 #include "signal.h"
 #include "privilege.h"
@@ -91,17 +87,8 @@ int main( int argc, char **argv)
 	signal(SIGHUP, sig_handler);   
 	signal(SIGALRM, sig_handler);
 #ifdef INCLUDE_BREAKPAD
-#ifndef DEVICE_CAMERA
    /* breakpad handles the signals SIGSEGV, SIGBUS, SIGFPE, and SIGILL */
    breakpad_ExceptionHandler();
-#else
-    /* breakpad handles the signals SIGSEGV, SIGBUS, SIGFPE, and SIGILL */
-    BreakPadWrapExceptionHandler eh;
-    eh = newBreakPadWrapExceptionHandler();
-    if(NULL != eh) {
-        ParodusInfo("Breakpad Initialized\n");
-    }
-#endif //DEVICE_CAMERA
 #else
 	signal(SIGSEGV, sig_handler);
 	signal(SIGBUS, sig_handler);
@@ -119,11 +106,6 @@ int main( int argc, char **argv)
    
    ParodusInfo("********** Starting component: Parodus **********\n "); 
    drop_root_privilege();
-    #ifdef ENABLE_WEBCFGBIN
-    registerRbusLogger();
-    subscribeRBUSevent();
-    regXmidtSendDataMethod();
-    #endif
    setDefaultValuesToCfg(cfg);
    if (0 != parseCommandLine(argc,argv,cfg)) {
 		abort();
@@ -131,7 +113,7 @@ int main( int argc, char **argv)
    curl_global_init(CURL_GLOBAL_DEFAULT);
     
    createSocketConnection( NULL);
-    free_cfg(cfg);
+    
    return 0;
 }

--- a/src/nopoll_handlers.c
+++ b/src/nopoll_handlers.c
@@ -149,7 +149,6 @@ void listenerOnPingMessage (noPollCtx * ctx, noPollConn * conn, noPollMsg * msg,
        if (nopoll_msg_opcode(msg) == NOPOLL_PING_FRAME) 
        {
            reset_heartBeatTimer();
-	    set_pingTimeStamp();
        }
    }
 }
--- a/src/nopoll_helpers.c
+++ b/src/nopoll_helpers.c
@@ -50,9 +50,9 @@ void setMessageHandlers()
    nopoll_conn_set_on_close(get_global_conn(), (noPollOnCloseHandler)listenerOnCloseMessage, NULL);
 }

-int cloud_status_is_online (void)
+static int cloud_status_is_online (void)
 {
-	const char *status = get_cloud_status();
+	const char *status = get_parodus_cfg()->cloud_status;
 	if (NULL == status)
 	  return false;
 	return (strcmp (status, CLOUD_STATUS_ONLINE) == 0);
@@ -60,14 +60,14 @@ int cloud_status_is_online (void)

 /** To send upstream msgs to server ***/

-int sendMessage(noPollConn *conn, void *msg, size_t len)
+void sendMessage(noPollConn *conn, void *msg, size_t len)
 {
    int bytesWritten = 0;

    if (!cloud_status_is_online ()) {
        ParodusError("Failed to send msg upstream as connection is not OK\n");
        OnboardLog("Failed to send msg upstream as connection is not OK\n");
-		return 1;
+		return;
 	}

    ParodusInfo("sendMessage length %zu\n", len);
@@ -77,9 +77,7 @@ int sendMessage(noPollConn *conn, void *msg, size_t len)
    if (bytesWritten != (int) len) 
    {
        ParodusError("Failed to send bytes %zu, bytes written were=%d (errno=%d, %s)..\n", len, bytesWritten, errno, strerror(errno));
-	return 1;
    }
-	return 0;
 }

 int sendResponse(noPollConn * conn, void * buffer, size_t length)
--- a/src/nopoll_helpers.h
+++ b/src/nopoll_helpers.h
@@ -41,7 +41,7 @@ extern "C" {
 */
 int sendResponse(noPollConn * conn,void *str, size_t bufferSize);
 void setMessageHandlers();
-int sendMessage(noPollConn *conn, void *msg, size_t len);
+void sendMessage(noPollConn *conn, void *msg, size_t len);

 /**
 * @brief __report_log Nopoll log handler 
--- a/src/partners_check.c
+++ b/src/partners_check.c
@@ -114,7 +114,7 @@ int validate_partner_id(wrp_msg_t *msg, partners_t **partnerIds)
                }

                /* Commandline input partner_ids not matching with partner_ids from request, appending to request partner_ids*/
-                if(matchFlag != 1 && partnerIds !=NULL)
+                if(matchFlag != 1)
                {
                    (*partnerIds) = (partners_t *) malloc(sizeof(partners_t) + (sizeof(char *) * (count+partnersList->count)));
                    (*partnerIds)->count = count+partnersList->count;
@@ -132,23 +132,6 @@ int validate_partner_id(wrp_msg_t *msg, partners_t **partnerIds)
                        i++;
                    }
                }
-		else if (matchFlag != 1 && partnerIds == NULL)
-		{
-			ParodusError("partner_id match not found: command line input %s , msg partner_id %s\n", temp, msg->u.event.partner_ids->partner_ids[0]);
-			if(partnersList != NULL)
-			{
-				for(j=0; j<partnersList->count; j++)
-				{
-					if(NULL != partnersList->partner_ids[j])
-					{
-						free(partnersList->partner_ids[j]);
-					}
-				}
-				free(partnersList);
-			}
-			free(partnerId);
-			return 1;
-		}
            }
            else
            {
--- a/src/time.c
+++ b/src/time.c
@@ -17,7 +17,6 @@

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

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

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

 uint64_t getCurrentTimeInMicroSeconds(struct timespec *timer)
--- a/src/upstream.c
+++ b/src/upstream.c
@@ -40,7 +40,7 @@
 /*----------------------------------------------------------------------------*/

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


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

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

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

                        int size = wrp_struct_to( eventMsg, WRP_BYTES, &bytes );
                        if(size > 0)
@@ -387,7 +371,7 @@ void *processUpstreamMessage()
 					//Sending to server for msgTypes 3, 5, 6, 7, 8.
 					if( WRP_MSG_TYPE__REQ == msgType )
 					{
-						(msg->u.req.headers != NULL && msg->u.req.headers->headers[0] != NULL && msg->u.req.headers->headers[1] != NULL) ? ParodusInfo(" Received upstream data with MsgType: %d dest: '%s' transaction_uuid: %s traceParent: %s traceState: %s\n", msgType, msg->u.req.dest, msg->u.req.transaction_uuid, msg->u.req.headers->headers[0], msg->u.req.headers->headers[1]) : ParodusInfo(" Received upstream data with MsgType: %d dest: '%s' transaction_uuid: %s\n", msgType, msg->u.req.dest, msg->u.req.transaction_uuid);
+						ParodusInfo(" Received upstream data with MsgType: %d dest: '%s' transaction_uuid: %s\n", msgType, msg->u.req.dest, msg->u.req.transaction_uuid );
 						sendUpstreamMsgToServer(&message->msg, message->len);
 					}
 					else
@@ -612,12 +596,11 @@ void getServiceNameAndSendResponse(wrp_msg_t *msg, void **msg_bytes, size_t msg_
 	}
 }

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

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

 #ifdef __cplusplus
 }
--- a/src/upstream_rbus.c
+++ b/src/upstream_rbus.c
@@ -27,66 +27,19 @@
 #include "upstream.h"
 #include "ParodusInternal.h"
 #include "partners_check.h"
-#include "close_retry.h"
-#include "connection.h"
-#include "heartBeat.h"

 #define WEBCFG_UPSTREAM_EVENT "Webconfig.Upstream"
-#ifdef WAN_FAILOVER_SUPPORTED
-#define WEBPA_INTERFACE "Device.X_RDK_WanManager.CurrentActiveInterface"
-#endif
-
-rbusHandle_t rbus_Handle;
-rbusError_t err;

 void processWebconfigUpstreamEvent(rbusHandle_t handle, rbusEvent_t const* event, rbusEventSubscription_t* subscription);

 void subscribeAsyncHandler( rbusHandle_t handle, rbusEventSubscription_t* subscription, rbusError_t error);

-rbusHandle_t get_parodus_rbus_Handle(void)
-{
-     return rbus_Handle;
-}
-
-/* Enables rbus ERROR level logs in parodus. Modify RBUS_LOG_ERROR check if more debug logs are needed from rbus. */
-void rbus_log_handler(
-    rbusLogLevel level,
-    const char* file,
-    int line,
-    int threadId,
-    char* message)
-{
-    ParodusPrint("threadId %d\n", threadId);
-    const char* slevel = "";
-
-    if(level < RBUS_LOG_ERROR)
-        return;
-
-    switch(level)
-    {
-	    case RBUS_LOG_DEBUG:    slevel = "DEBUG";   break;
-	    case RBUS_LOG_INFO:     slevel = "INFO";    break;
-	    case RBUS_LOG_WARN:     slevel = "WARN";    break;
-	    case RBUS_LOG_ERROR:    slevel = "ERROR";   break;
-	    case RBUS_LOG_FATAL:    slevel = "FATAL";   break;
-    }
-    ParodusInfo("%5s %s:%d -- %s\n", slevel, file, line, message);
-}
-
-void registerRbusLogger()
-{
-	rbus_registerLogHandler(rbus_log_handler);
-	ParodusPrint("Registered rbus log handler\n");
-}
-
-#ifdef WAN_FAILOVER_SUPPORTED
-void eventReceiveHandler( rbusHandle_t rbus_Handle, rbusEvent_t const* event, rbusEventSubscription_t* subscription );
-#endif
-
 /* API to register RBUS listener to receive messages from webconfig */
 void subscribeRBUSevent()
 {
+	rbusError_t err;
    int rc = RBUS_ERROR_SUCCESS;
+	rbusHandle_t rbus_Handle;
 	err = rbus_open(&rbus_Handle, "parodus");
 	if (err)
 	{
@@ -100,21 +53,6 @@ void subscribeRBUSevent()
        ParodusInfo("rbusEvent_Subscribe was successful\n");
 }

-#ifdef WAN_FAILOVER_SUPPORTED
-/* API to subscribe Active Interface name on value change event*/
-int subscribeCurrentActiveInterfaceEvent()
-{
-	int rc = RBUS_ERROR_SUCCESS;
-	ParodusInfo("Subscribing to Device.X_RDK_WanManager.CurrentActiveInterface Event\n");
-	rc = rbusEvent_SubscribeAsync(rbus_Handle,WEBPA_INTERFACE,eventReceiveHandler,subscribeAsyncHandler,"parodusInterface",10*20);
-        if(rc != RBUS_ERROR_SUCCESS)
-	{
-		ParodusError("%s subscribe failed : %d - %s\n", WEBPA_INTERFACE, rc, rbusError_ToString(rc));
-        }   
-	return rc;	
-} 
-#endif
-
 void processWebconfigUpstreamEvent(rbusHandle_t handle, rbusEvent_t const* event, rbusEventSubscription_t* subscription)
 {
    (void)handle;
@@ -142,7 +80,6 @@ void processWebconfigUpstreamEvent(rbusHandle_t handle, rbusEvent_t const* event
 		if(ret == 1)
 		{
 		    wrp_msg_t *eventMsg = (wrp_msg_t *) malloc(sizeof(wrp_msg_t));
-		    memset( eventMsg, 0, sizeof( wrp_msg_t ) );
 		    eventMsg->msg_type = event_msg->msg_type;
 		    eventMsg->u.event.content_type=event_msg->u.event.content_type;
 		    eventMsg->u.event.source=event_msg->u.event.source;
@@ -152,15 +89,6 @@ void processWebconfigUpstreamEvent(rbusHandle_t handle, rbusEvent_t const* event
 		    eventMsg->u.event.headers=event_msg->u.event.headers;
 		    eventMsg->u.event.metadata=event_msg->u.event.metadata;
 		    eventMsg->u.event.partner_ids = partnersList;
-		    if(event_msg->u.event.transaction_uuid)
-		    {
-			  ParodusPrint("Inside Trans id in PARODUS_rbus\n");
-		    }
-		    else
-		    {
-			  ParodusPrint("Assigning NULL to trans id RBUS\n");
-			  eventMsg->u.event.transaction_uuid = NULL;
-		    }

 		   int size = wrp_struct_to( eventMsg, WRP_BYTES, &bytes );
 		   if(size > 0)
@@ -195,49 +123,3 @@ void subscribeAsyncHandler( rbusHandle_t handle, rbusEventSubscription_t* subscr
 	(void)handle;
 	ParodusInfo("subscribeAsyncHandler event %s, error %d - %s\n",subscription->eventName, error, rbusError_ToString(error));
 }
-
-#ifdef WAN_FAILOVER_SUPPORTED
-void eventReceiveHandler( rbusHandle_t rbus_Handle, rbusEvent_t const* event, rbusEventSubscription_t* subscription )
-{
-    (void)subscription;
-    ParodusPrint("Handling event inside eventReceiveHandler\n");
-    (void)rbus_Handle;
-    char * interface = NULL;
-    rbusValue_t newValue = rbusObject_GetValue(event->data, "value");
-    rbusValue_t oldValue = rbusObject_GetValue(event->data, "oldValue");
-    ParodusInfo("Consumer received ValueChange event for param %s\n", event->name);
-    
-    if(newValue) {    
-        interface = (char *) rbusValue_GetString(newValue, NULL);
-	setWebpaInterface(interface);
-    }
-    else {
-	   ParodusError("newValue is NULL\n");
-    }
-
-    if(newValue !=NULL && oldValue!=NULL && interface!=NULL) {
-	ParodusInfo("New Value: %s Old Value: %s New Interface Value: %s\n", rbusValue_GetString(newValue, NULL), rbusValue_GetString(oldValue, NULL), interface);
-	
-	// If interface is already down then reset it and reconnect cloud conn as wan failover event is received
-	if(get_interface_down_event()) 
-	{
-		reset_interface_down_event();
-		ParodusInfo("Interface_down_event is reset\n");
-		resume_heartBeatTimer();
-	}
-	// Close cloud conn and reconnect with the new interface as wan failover event is received
-	set_global_reconnect_reason("WAN_FAILOVER");
-	set_global_reconnect_status(true);
-	set_close_retry();
-
-    }
-    else {
-         if(oldValue == NULL) {
-     	        ParodusError("oldValue is NULL\n");
-         }  
-         if(interface == NULL) {
-	        ParodusError("interface is NULL\n"); 
-         }  
-    }
-}
-#endif
--- a/src/xmidtsend_rbus.c
+++ b/src/xmidtsend_rbus.c
--- a/src/xmidtsend_rbus.h
+++ b/src/xmidtsend_rbus.h
@@ -1,127 +0,0 @@
-/**
- * Copyright 2022 Comcast Cable Communications Management, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-/**
- * @file xmidtsend_rbus.h
- *
- * @description This header defines functions required to manage xmidt send messages via rbus.
- *
- */
- 
-#ifndef _XMIDTSEND_RBUS_H_
-#define _XMIDTSEND_RBUS_H_
-#include <rbus.h>
-#include "config.h"
-#include <uuid/uuid.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define XMIDT_SEND_METHOD "Device.X_RDK_Xmidt.SendData"
-#define INPARAMS_PATH   "/tmp/inparams.txt"
-
-#define CLOUD_ACK_TIMEOUT_SEC       7
-#define CRITICAL_QOS_EXPIRE_TIME    30*60
-#define HIGH_QOS_EXPIRE_TIME        25*60
-#define MEDIUM_QOS_EXPIRE_TIME      20*60
-#define LOW_QOS_EXPIRE_TIME         15*60
-
-#define EXPIRY_CHECK_TIME           5*60 //To check expiry in every 5 mins when cloud connection is down.
-/*----------------------------------------------------------------------------*/
-/*                               Data Structures                              */
-/*----------------------------------------------------------------------------*/
-typedef struct XmidtMsg__
-{
-	wrp_msg_t *msg;
-	rbusMethodAsyncHandle_t asyncHandle;
-	int state;
-	long long enqueueTime;
-	long long sentTime;
-	struct XmidtMsg__ *next;
-} XmidtMsg;
-
-typedef struct CloudAck__
-{
-	char *transaction_id;
-	int qos;
-	int rdr;
-	char *source;
-	struct CloudAck__ *next;
-} CloudAck;
-
-typedef enum
-{
-    DELIVERED_SUCCESS = 0,
-    INVALID_MSG_TYPE,
-    MISSING_SOURCE,
-    MISSING_DEST,
-    MISSING_CONTENT_TYPE,
-    MISSING_PAYLOAD,
-    MISSING_PAYLOADLEN,
-    INVALID_CONTENT_TYPE,
-    ENQUEUE_FAILURE = 100,
-    CLIENT_DISCONNECT = 101,
-    QUEUE_SIZE_EXCEEDED = 102,
-    WRP_ENCODE_FAILURE = 103,
-    MSG_PROCESSING_FAILED = 104,
-    QOS_SEMANTICS_DISABLED = 105,
-    MSG_EXPIRED = 106,
-    QUEUE_OPTIMIZED = 107
-} XMIDT_STATUS;
-
-typedef enum
-{
-    PENDING = 0,
-    SENT,
-    DELETE
-} MSG_STATUS;
-/*----------------------------------------------------------------------------*/
-/*                             Function Prototypes                            */
-/*----------------------------------------------------------------------------*/
-
-rbusHandle_t get_parodus_rbus_Handle(void);
-void addToXmidtUpstreamQ(wrp_msg_t * msg, rbusMethodAsyncHandle_t asyncHandle);
-void* processXmidtUpstreamMsg();
-void processXmidtData();
-int processData(XmidtMsg *Datanode, wrp_msg_t * msg, rbusMethodAsyncHandle_t asyncHandle);
-int sendXmidtEventToServer(XmidtMsg *msgnode, wrp_msg_t * msg, rbusMethodAsyncHandle_t asyncHandle);
-int checkInputParameters(rbusObject_t inParams);
-char* generate_transaction_uuid();
-void parseRbusInparamsToWrp(rbusObject_t inParams, char *trans_id, wrp_msg_t **eventMsg);
-void createOutParamsandSendAck(wrp_msg_t *msg, rbusMethodAsyncHandle_t asyncHandle, char *errorMsg, int statuscode, char *cloudsource, rbusError_t error);
-int validateXmidtData(wrp_msg_t * eventMsg, char **errorMsg, int *statusCode);
-void printSendMsgData(char* status, int qos, char* dest, char* transaction_uuid);
-bool highQosValueCheck(int qos);
-void waitTillConnectionIsUp();
-void printRBUSParams(rbusObject_t params, char* file_path);
-void addToCloudAckQ(char *transaction_id, int qos, int rdr, char *source);
-int checkCloudACK(XmidtMsg *xmdnode, rbusMethodAsyncHandle_t asyncHandle);
-int updateXmidtState(XmidtMsg * temp, int state);
-void print_xmidMsg_list();
-int deleteCloudACKNode(char* trans_id);
-int deleteFromXmidtQ(XmidtMsg **next_node);
-int checkCloudConn();
-void checkMaxQandOptimize(XmidtMsg *xmdMsg);
-void checkMsgExpiry(XmidtMsg *xmdMsg);
-void mapXmidtStatusToStatusMessage(int status, char **message);
-int xmidtQOptmize();
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* _XMIDTSEND_RBUS_H_ */
-
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -33,7 +33,7 @@ set (PARODUS_COMMON_LIBS ${PARODUS_COMMON_LIBS} -lucresolv -lresolv)
 endif (FEATURE_DNS_QUERY)

 if (ENABLE_WEBCFGBIN)
-set (PARODUS_COMMON_LIBS ${PARODUS_COMMON_LIBS} -lrbus)
+set (PARODUS_COMMON_LIBS ${PARODUS_COMMON_LIBS} -lrbus -lrbus-core)
 endif (ENABLE_WEBCFGBIN)

 if(NOT DISABLE_VALGRIND)
@@ -46,7 +46,7 @@ link_directories ( ${LIBRARY_DIR} )
 #   test_heartBeatTimer
 #-------------------------------------------------------------------------------
 add_test(NAME test_heartBeatTimer COMMAND ${MEMORY_CHECK} ./test_heartBeatTimer)
-add_executable(test_heartBeatTimer test_heartBeatTimer.c ../src/heartBeat.c ../src/time.c)
+add_executable(test_heartBeatTimer test_heartBeatTimer.c ../src/heartBeat.c)
 target_link_libraries (test_heartBeatTimer ${PARODUS_COMMON_LIBS} -lcmocka)

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

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

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


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

 #-------------------------------------------------------------------------------
@@ -163,7 +160,7 @@ set(CLIST_SRC ${CLIST_SRC} ../src/seshat_interface_stub.c)
 endif (ENABLE_SESHAT)

 if (ENABLE_WEBCFGBIN)
-set(CLIST_SRC ${CLIST_SRC} ../src/upstream_rbus.c ../src/xmidtsend_rbus.c)
+set(CLIST_SRC ${CLIST_SRC} ../src/upstream_rbus.c)
 endif (ENABLE_WEBCFGBIN)

 add_executable(test_client_list ${CLIST_SRC})
@@ -184,7 +181,7 @@ set(SVA_SRC ${SVA_SRC} ../src/seshat_interface_stub.c)
 endif (ENABLE_SESHAT)

 if (ENABLE_WEBCFGBIN)
-set(SVA_SRC ${SVA_SRC} ../src/upstream_rbus.c ../src/xmidtsend_rbus.c)
+set(SVA_SRC ${SVA_SRC} ../src/upstream_rbus.c)
 endif (ENABLE_WEBCFGBIN)

 add_executable(test_service_alive ${SVA_SRC})
@@ -215,7 +212,7 @@ target_link_libraries (test_auth_token -lcmocka
 #   test_auth_token_more
 #-------------------------------------------------------------------------------
 add_test(NAME test_auth_token_more COMMAND ${MEMORY_CHECK} ./test_auth_token_more)
-add_executable(test_auth_token_more test_auth_token_more.c ../src/config.c ../src/auth_token.c ../src/string_helpers.c ../src/config.c)
+add_executable(test_auth_token_more test_auth_token_more.c ../src/config.c ../src/auth_token.c ../src/string_helpers.c)
 target_link_libraries (test_auth_token_more -lcmocka
 -Wl,--no-as-needed -lcimplog
 -lcjson -lcjwt -ltrower-base64 -lssl -lcrypto -lrt -lm -lcurl -luuid
@@ -268,7 +265,7 @@ target_link_libraries (test_upstream_sock -lcmocka gcov -lcunit -lcimplog
 #   test_downstream
 #-------------------------------------------------------------------------------
 add_test(NAME test_downstream COMMAND ${MEMORY_CHECK} ./test_downstream)
-add_executable(test_downstream test_downstream.c ../src/downstream.c ../src/string_helpers.c ../src/config.c)
+add_executable(test_downstream test_downstream.c ../src/downstream.c ../src/string_helpers.c)
 target_link_libraries (test_downstream -lcmocka gcov -lcunit -lcimplog
 -lwrp-c -luuid -lpthread -lmsgpackc -lnopoll
 -Wl,--no-as-needed -lcjson -lcjwt -ltrower-base64
@@ -278,7 +275,7 @@ target_link_libraries (test_downstream -lcmocka gcov -lcunit -lcimplog
 #   test_downstream_more
 #-------------------------------------------------------------------------------
 add_test(NAME test_downstream_more COMMAND ${MEMORY_CHECK} ./test_downstream_more)
-add_executable(test_downstream_more test_downstream_more.c ../src/downstream.c ../src/string_helpers.c ../src/config.c)
+add_executable(test_downstream_more test_downstream_more.c ../src/downstream.c ../src/string_helpers.c)
 target_link_libraries (test_downstream_more -lcmocka ${PARODUS_COMMON_LIBS} )

 #-------------------------------------------------------------------------------
@@ -299,7 +296,6 @@ set(CONIFC_SRC test_conn_interface.c
  ../src/token.c
  ../src/string_helpers.c 
  ../src/mutex.c
-  ../src/time.c
  ../src/heartBeat.c
  ../src/close_retry.c
  ../src/event_handler.c
@@ -311,7 +307,7 @@ else()
 set(CONIFC_SRC ${CONIFC_SRC} ../src/seshat_interface_stub.c)
 endif (ENABLE_SESHAT)
 if (ENABLE_WEBCFGBIN)
-set(CONIFC_SRC ${CONIFC_SRC} ../src/upstream_rbus.c ../src/xmidtsend_rbus.c)
+set(CONIFC_SRC ${CONIFC_SRC} ../src/upstream_rbus.c)
 endif (ENABLE_WEBCFGBIN)
 add_executable(test_conn_interface ${CONIFC_SRC})
 target_link_libraries (test_conn_interface -lcmocka ${PARODUS_COMMON_LIBS} -lcurl -luuid )
@@ -360,7 +356,7 @@ set(TOKEN_SRC test_token_stub.c ${TOKEN_SRC})
 endif (FEATURE_DNS_QUERY)

 if (ENABLE_WEBCFGBIN)
-set(TOKEN_SRC ${TOKEN_SRC} ../src/upstream_rbus.c ../src/xmidtsend_rbus.c)
+set(TOKEN_SRC ${TOKEN_SRC} ../src/upstream_rbus.c)
 endif (ENABLE_WEBCFGBIN)

 add_executable(test_token ${TOKEN_SRC} ) 
--- a/tests/simple_connection.c
+++ b/tests/simple_connection.c
@@ -92,7 +92,7 @@ void test_set_parodus_cfg()
    CU_ASSERT_STRING_EQUAL(cfg.hw_last_reboot_reason,get_parodus_cfg()->hw_last_reboot_reason);
    CU_ASSERT_STRING_EQUAL(cfg.fw_name,get_parodus_cfg()->fw_name);
    CU_ASSERT_STRING_EQUAL(cfg.webpa_url, get_parodus_cfg()->webpa_url);
-    CU_ASSERT_STRING_EQUAL(cfg.webpa_interface_used , getWebpaInterface());
+    CU_ASSERT_STRING_EQUAL(cfg.webpa_interface_used , get_parodus_cfg()->webpa_interface_used);
    CU_ASSERT_STRING_EQUAL(cfg.webpa_protocol, get_parodus_cfg()->webpa_protocol);
    CU_ASSERT_EQUAL(cfg.boot_time, get_parodus_cfg()->boot_time);
    CU_ASSERT_EQUAL(cfg.webpa_ping_timeout, get_parodus_cfg()->webpa_ping_timeout);
@@ -113,7 +113,7 @@ void test_getWebpaConveyHeader()
    CU_ASSERT_STRING_EQUAL(get_parodus_cfg()->hw_manufacturer, cJSON_GetObjectItem(payload, HW_MANUFACTURER)->valuestring);
    CU_ASSERT_STRING_EQUAL(get_parodus_cfg()->hw_last_reboot_reason, cJSON_GetObjectItem(payload, HW_LAST_REBOOT_REASON)->valuestring);
    CU_ASSERT_STRING_EQUAL(get_parodus_cfg()->fw_name, cJSON_GetObjectItem(payload, FIRMWARE_NAME)->valuestring);
-    CU_ASSERT_STRING_EQUAL(getWebpaInterface(), cJSON_GetObjectItem(payload, WEBPA_INTERFACE)->valuestring);
+    CU_ASSERT_STRING_EQUAL(get_parodus_cfg()->webpa_interface_used, cJSON_GetObjectItem(payload, WEBPA_INTERFACE)->valuestring);
    CU_ASSERT_STRING_EQUAL(get_parodus_cfg()->webpa_protocol, cJSON_GetObjectItem(payload, WEBPA_PROTOCOL)->valuestring);
    CU_ASSERT_EQUAL((int)get_parodus_cfg()->boot_time, cJSON_GetObjectItem(payload, BOOT_TIME)->valueint);

--- a/tests/test_config.c
+++ b/tests/test_config.c
@@ -104,7 +104,7 @@ void test_setParodusConfig()
    assert_string_equal(cfg.hw_last_reboot_reason, temp->hw_last_reboot_reason);
    assert_string_equal(cfg.webpa_path_url, temp->webpa_path_url);
    assert_string_equal(cfg.webpa_url, temp->webpa_url);
-    assert_string_equal(cfg.webpa_interface_used, getWebpaInterface());
+    assert_string_equal(cfg.webpa_interface_used, temp->webpa_interface_used);
    assert_string_equal(cfg.webpa_protocol, temp->webpa_protocol);
    assert_string_equal(cfg.webpa_uuid, temp->webpa_uuid);
    assert_string_equal(cfg.partner_id, temp->partner_id);
@@ -209,11 +209,13 @@ void test_parseCommandLine()

    ParodusCfg parodusCfg;
    memset(&parodusCfg,0,sizeof(parodusCfg));
+
 #ifdef FEATURE_DNS_QUERY
 	write_key_to_file ("../../tests/jwt_key.tst", jwt_key);
 #endif
    create_token_script("/tmp/token.sh");
    assert_int_equal (parseCommandLine(argc,command,&parodusCfg), 0);
+
    assert_string_equal( parodusCfg.hw_model, "TG1682");
    assert_string_equal( parodusCfg.hw_serial_number, "Fer23u948590");
    assert_string_equal( parodusCfg.hw_manufacturer, "ARRISGroup,Inc.");
--- a/tests/test_conn_interface.c
+++ b/tests/test_conn_interface.c
@@ -71,10 +71,7 @@ void nopoll_log_set_handler	(noPollCtx *ctx, noPollLogHandler handler, noPollPtr
    UNUSED(ctx); UNUSED(handler); UNUSED(user_data);
    function_called(); 
 }
-int cloud_status_is_online (void)
-{
-	return 0;
-}
+
 void __report_log (noPollCtx * ctx, noPollDebugLevel level, const char * log_msg, noPollPtr user_data)
 {
    UNUSED(ctx); UNUSED(level); UNUSED(log_msg); UNUSED(user_data);
@@ -106,11 +103,6 @@ void set_global_shutdown_reason(char *reason)
    UNUSED(reason);
 }

-int getDeviceId(char **device_id, size_t *device_id_len)
-{
-	UNUSED(device_id); UNUSED(device_id_len);
-	return 0;
-}
 void start_conn_in_progress (unsigned long start_time)
 {
 	UNUSED(start_time);
@@ -147,10 +139,6 @@ void packMetaData()
    function_called();
 }

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

 int get_cloud_disconnect_time(void)
 {
@@ -190,10 +178,10 @@ int validate_partner_id(wrp_msg_t *msg, partners_t **partnerIds)
 	return 0;
 }

-int sendUpstreamMsgToServer(void **resp_bytes, size_t resp_size)
+void sendUpstreamMsgToServer(void **resp_bytes, size_t resp_size)
 {
 	UNUSED(resp_bytes); UNUSED(resp_size);
-	return 0;
+	return;
 }

 int nopoll_loop_wait(noPollCtx * ctx,long timeout)
--- a/tests/test_createConnection.c
+++ b/tests/test_createConnection.c
@@ -341,7 +341,7 @@ void test_createConnection()

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

-char* getWebpaInterface(void)
-{
-   return NULL;
-}
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/
--- a/tests/test_crud_internal.c
+++ b/tests/test_crud_internal.c
@@ -1530,7 +1530,7 @@ void test_retrieveObject_cloud_status()
 	ret = retrieveObject(reqMsg, &respMsg);
 	assert_int_equal (respMsg->u.crud.status, 200);
 	assert_int_equal (ret, 0);
-	assert_string_equal(get_cloud_status(), CLOUD_STATUS_ONLINE);
+	assert_string_equal(get_parodus_cfg()->cloud_status, CLOUD_STATUS_ONLINE);
 	assert_int_equal (respMsg->u.crud.payload_size, 25);

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

-void addToCloudAckQ(char *transaction_id, int qos, int rdr)
-{
-	(void)transaction_id;
-	(void)qos;
-	(void)rdr;
-	return;
-}
-
-bool highQosValueCheck(int qos)
-{
-	(void)qos;
-	return false;
-}
-
 ssize_t wrp_to_struct( const void *bytes, const size_t length, const enum wrp_format fmt,
                       wrp_msg_t **msg )
 {
--- a/tests/test_heartBeatTimer.c
+++ b/tests/test_heartBeatTimer.c
@@ -79,6 +79,7 @@ void test_mutexHeartBeatTimer() {
 	ParodusInfo("heartBeatTimer reset to: %d\n", heartBeatTimer);
 	assert_int_equal(heartBeatTimer, 0);
 }
+
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
--- a/tests/test_nopoll_handlers_fragment.c
+++ b/tests/test_nopoll_handlers_fragment.c
@@ -68,6 +68,7 @@ nopoll_bool nopoll_msg_is_final(noPollMsg *msg)
    function_called();
    return (nopoll_bool) mock();
 }
+
 const unsigned char *nopoll_msg_get_payload(noPollMsg *msg)
 {
 	(void)msg;
--- a/tests/test_nopoll_helpers.c
+++ b/tests/test_nopoll_helpers.c
@@ -24,9 +24,6 @@
 #include "../src/parodus_log.h"
 #include "../src/nopoll_helpers.h"
 #include "../src/config.h"
-#include <cjwt/cjwt.h>
-#include "../src/connection.h"
-#include "../src/ParodusInternal.h"

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

+ParodusCfg *get_parodus_cfg(void)
+{
+	function_called();
+    return &cfg;
+}
+
 int  __nopoll_conn_send_common (noPollConn * conn, const char * content, long length, nopoll_bool  has_fin, long       sleep_in_header, noPollOpCode frame_type)
 {
    UNUSED(has_fin); UNUSED(sleep_in_header); UNUSED(frame_type); UNUSED(content);
@@ -127,7 +131,6 @@ bool get_interface_down_event()
     return false;
 }

-
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/
@@ -218,7 +221,8 @@ void test_sendMessage()
 {
    int len = strlen("Hello Parodus!");
    
-    get_parodus_cfg()->cloud_status = CLOUD_STATUS_ONLINE;
+    cfg.cloud_status = CLOUD_STATUS_ONLINE;
+    expect_function_calls (get_parodus_cfg, 1);
    
    expect_value(__nopoll_conn_send_common, (intptr_t)conn, (intptr_t)conn);
    expect_value(__nopoll_conn_send_common, length, len);
@@ -232,7 +236,8 @@ void test_sendMessageOffline()
 {
    int len = strlen("Hello Parodus!");
    
-    get_parodus_cfg()->cloud_status = CLOUD_STATUS_OFFLINE;
+    cfg.cloud_status = CLOUD_STATUS_OFFLINE;
+    expect_function_calls (get_parodus_cfg, 1);
    sendMessage(conn, "Hello Parodus!", len);
    
 }
@@ -241,7 +246,8 @@ void err_sendMessage()
 {
    int len = strlen("Hello Parodus!");
    
-    get_parodus_cfg()->cloud_status = CLOUD_STATUS_ONLINE;
+    cfg.cloud_status = CLOUD_STATUS_ONLINE;
+    expect_function_calls (get_parodus_cfg, 1);

    expect_value(__nopoll_conn_send_common, (intptr_t)conn,(intptr_t) conn);
    expect_value(__nopoll_conn_send_common, length, len);
@@ -260,7 +266,8 @@ void err_sendMessageConnNull()
 {
    int len = strlen("Hello Parodus!");
    
-    get_parodus_cfg()->cloud_status = CLOUD_STATUS_ONLINE;
+    cfg.cloud_status = CLOUD_STATUS_ONLINE;
+    expect_function_calls (get_parodus_cfg, 1);

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

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

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