Use newer codecove action.

.github/workflows/push.yml

@@ -4,7 +4,7 @@
 name: CI
 
 on:
-  pull_request:
+  pull_request_target:
   push:
     paths-ignore:
       - 'AUTHORS'
@@ -24,7 +24,7 @@ jobs:
     runs-on: [ ubuntu-latest ]
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -38,11 +38,9 @@ jobs:
       - name: Make Build Directory
         run: mkdir build
 
-      - name: Get Sonarcloud Binaries
-        working-directory: build
-        run: |
-          ../.github/scripts/get_sonarcloud.sh
-
+      - name:  Install sonar-scanner and build-wrapper
+        uses: sonarsource/sonarcloud-github-c-cpp@v2
+        
       - name: CMake
         working-directory: build
         run: |
@@ -52,7 +50,7 @@ jobs:
       - name: Build
         working-directory: build
         run: |
-          build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-output make all test
+          build-wrapper-linux-x86-64 --out-dir bw-output make all test
 
       - name: Merge GCOV Reports for Sonarcloud
         working-directory: build
@@ -66,7 +64,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload Codecov.io
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
         with:
-          directory: .
-          fail_ci_if_error: true
+          directory:        .
+          flags:            unittests
+          fail_ci_if_error: true

CHANGELOG.md

@@ -5,12 +5,12 @@ 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]
-- Add additional HTTP headers for call to Themis from Convey
-- Add callback handler for initial cloud connection status change event
-- Fix Parodus connection stuck on interface up down received together
-- Update to use nopoll version 1.0.3
 
-## [1.1.4]
+## [v1.1.5]
+- Add additional HTTP headers for call to Themis from Convey
+- Change default branch name to `main`
+
+## [v1.1.4]
 - on connect retry, requery jwt only if it failed before 
 - put two timestamps in connection health file; start conn and current
 - change health file update interval to 240sec
@@ -105,8 +105,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Initial creation
 
-[Unreleased]: https://github.com/Comcast/parodus/compare/1.1.4...HEAD
-[1.1.4]: https://github.com/Comcast/parodus/compare/1.1.3...1.1.4
+[Unreleased]: https://github.com/Comcast/parodus/compare/v1.1.5...HEAD
+[1.1.5]: https://github.com/Comcast/parodus/compare/v1.1.4...v1.1.5
+[1.1.4]: https://github.com/Comcast/parodus/compare/1.1.3...v1.1.4
 [1.1.3]: https://github.com/Comcast/parodus/compare/1.1.2...1.1.3
 [1.1.2]: https://github.com/Comcast/parodus/compare/1.1.1...1.1.2
 [1.1.1]: https://github.com/Comcast/parodus/compare/1.0.4...1.1.1

CMakeLists.txt

@@ -14,7 +14,7 @@
 
 cmake_minimum_required(VERSION 2.8.7)
 
-#project(parodus VERSION 1.1.15)
+#project(parodus VERSION 1.1.5)
 project(parodus)
 
 include(ExternalProject)
@@ -43,13 +43,6 @@ include_directories(${INCLUDE_DIR}
                     ${INCLUDE_DIR}/cjwt
 					)	
 
-if (ENABLE_WEBCFGBIN)
-include_directories(${INCLUDE_DIR}/rbus
-		    ${INCLUDE_DIR}/rbus-core
-		    ${INCLUDE_DIR}/rtmessage
-)
-endif (ENABLE_WEBCFGBIN)
-
 # Get git commit hash 
 #-------------------------------------------------------------------------------
 execute_process(
@@ -93,7 +86,7 @@ add_dependencies(libtrower-base64 trower-base64)
 ExternalProject_Add(nopoll
     PREFIX ${PREFIX_DIR}/nopoll
     GIT_REPOSITORY https://github.com/Comcast/nopoll.git
-    GIT_TAG "1.0.3"
+    GIT_TAG "1.0.2"
     CONFIGURE_COMMAND COMMAND <SOURCE_DIR>/autogen.sh --prefix=${PREFIX}
                                                      --includedir=${INCLUDE_DIR}
                                                      --libdir=${LIBRARY_DIR}
@@ -236,51 +229,6 @@ 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/rdkcmf/rbus.git
-     GIT_TAG rdk-next
-     CMAKE_ARGS += -DBUILD_FOR_DESKTOP=ON -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_TESTING=OFF
-)
-
-add_library(librbus STATIC SHARED IMPORTED)
-add_dependencies(librbus rbus)
-endif (ENABLE_WEBCFGBIN)
-
 if (BUILD_TESTING)
 # cmocka external dependency
 #-------------------------------------------------------------------------------
@@ -305,10 +253,6 @@ if (FEATURE_DNS_QUERY)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFEATURE_DNS_QUERY ")
 endif (FEATURE_DNS_QUERY)
 
-if (ENABLE_WEBCFGBIN)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_WEBCFGBIN ")
-endif (ENABLE_WEBCFGBIN)
-
 link_directories ( ${LIBRARY_DIR} ${COMMON_LIBRARY_DIR} ${LIBRARY_DIR64} )
 add_subdirectory(src)
 if (BUILD_TESTING)

src/CMakeLists.txt

@@ -23,9 +23,6 @@ else()
 set(SOURCES ${SOURCES} seshat_interface_stub.c)
 endif (ENABLE_SESHAT)
 
-if (ENABLE_WEBCFGBIN)
-set(SOURCES ${SOURCES} upstream_rbus.c)
-endif (ENABLE_WEBCFGBIN)
 
 add_executable(parodus ${SOURCES})
 
@@ -56,7 +53,5 @@ if (ENABLE_SESHAT)
 target_link_libraries (parodus -llibseshat)
 endif (ENABLE_SESHAT)
 
-if (ENABLE_WEBCFGBIN)
-target_link_libraries (parodus -lrbus -lrbus-core)
-endif (ENABLE_WEBCFGBIN)
+
 install (TARGETS parodus DESTINATION bin)

src/ParodusInternal.h

@@ -161,9 +161,7 @@ int readFromFile(const char *file_name, char **data);
 void timespec_diff(struct timespec *start, struct timespec *stop,
                    struct timespec *result);
 
-#ifdef ENABLE_WEBCFGBIN
-void subscribeRBUSevent();
-#endif
+
 /*------------------------------------------------------------------------------*/
 /*                        For interface_down_event Flag                         */
 /*------------------------------------------------------------------------------*/

src/config.c

@@ -163,38 +163,6 @@ int parse_mac_address (char *target, const char *arg)
 	return 0;
 }
 
-int parse_serial_num(char *target, const char *arg)
-{
-	char ch;
-	if(arg != NULL)
-	{
-	    if(strlen(arg) == 0)
-	    {
-	   	ParodusError("Empty serial number, setting to default unknown\n");
-		strcpy(target,"unknown");
-	    }
-            for(int i=0; (ch = arg[i]) != '\0'; i++)
-	    {
-	        // check if character is ascii, a-z --> 97 to 122, A-Z --> 65 to 90, digits(0 to 9) --> 48 to 57
-	    	if((ch >= 97 && ch <= 122) || (ch >= 65 && ch <= 90) || (ch >=48 && ch <= 57))
-	        {
-		    target[i] = ch;
-	        }
-	        else
-	        {
-		    ParodusError("Invalid serial number, setting to default unknown\n");
-		    strcpy(target,"unknown");
-		    break;
-	        }
-	    }
-	}
-        else
-        {
-            ParodusError("serial number argument is NULL\n");
-        }
-   return 0;	
-}
-
 int server_is_http (const char *full_url,
 	const char **server_ptr)
 {
@@ -449,8 +417,8 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
          break;
         
         case 's':
-	if(parse_serial_num(cfg->hw_serial_number, optarg) == 0)
-            ParodusInfo ("hw_serial-number is %s\n",cfg->hw_serial_number);
+          parStrncpy(cfg->hw_serial_number,optarg,sizeof(cfg->hw_serial_number));
+          ParodusInfo("hw_serial_number is %s\n",cfg->hw_serial_number);
           break;
 
         case 'f':

src/conn_interface.c

@@ -77,7 +77,6 @@ void createSocketConnection(void (* initKeypress)())
     server_list_t server_list;  
     bool seshat_registered = false;
     int create_conn_rtn = 0;
-    int nopoll_returnvalue = 0;	
     unsigned int webpa_ping_timeout_ms = 1000 * get_parodus_cfg()->webpa_ping_timeout;
     unsigned int heartBeatTimer = 0;
     struct timespec start_svc_alive_timer;
@@ -113,9 +112,6 @@ 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);
@@ -135,17 +131,14 @@ void createSocketConnection(void (* initKeypress)())
         struct timespec start, stop, diff;
         int time_taken_ms;
 
-        clock_gettime(CLOCK_MONOTONIC, &start);
-        nopoll_returnvalue = nopoll_loop_wait(ctx, 5000000);
-        clock_gettime(CLOCK_MONOTONIC, &stop);
+        clock_gettime(CLOCK_REALTIME, &start);
+        nopoll_loop_wait(ctx, 5000000);
+        clock_gettime(CLOCK_REALTIME, &stop);
 
         timespec_diff(&start, &stop, &diff);
         time_taken_ms = diff.tv_sec * 1000 + (diff.tv_nsec / 1000000);
-	if(time_taken_ms/1000 != 5)
-	{
-        	ParodusInfo("nopoll_loop_wait value %d,nopoll_loop_wait() time %d msec\n",nopoll_returnvalue, time_taken_ms);
-	}
-	ParodusPrint("webpa_ping_timeout_ms %d msec\n", webpa_ping_timeout_ms);
+
+        // ParodusInfo("nopoll_loop_wait() time %d msec\n", time_taken_ms);
 	heartBeatTimer = get_heartBeatTimer();
         if(heartBeatTimer >= webpa_ping_timeout_ms)
         {
@@ -202,8 +195,7 @@ void createSocketConnection(void (* initKeypress)())
             }
             createNopollConnection(ctx, &server_list);
         }
-	 //process exit only when g_shutdown is true.
-       } while(FOREVER() && !g_shutdown);
+       } while(!get_close_retry() && !g_shutdown);
 
     pthread_mutex_lock (get_global_svc_mut());
     pthread_cond_signal (get_global_svc_con());

src/connection.c

@@ -62,8 +62,6 @@ enum {
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
 
-parodusOnConnStatusChangeHandler on_conn_status_change;
-
 parodusOnPingStatusChangeHandler on_ping_status_change;
 
 pthread_mutex_t backoff_delay_mut=PTHREAD_MUTEX_INITIALIZER;
@@ -699,8 +697,7 @@ int wait_while_interface_down()
   	  if (rtn != 0)
   	    ParodusError 
   	      ("Error on pthread_cond_wait (%d) in wait_while_interface_down\n", rtn);
-	  if (g_shutdown) {
-	    ParodusInfo("Received g_shutdown during interface down wait, returning\n");
+  	  if ((rtn != 0) || g_shutdown) {
 	    return -1;
 	  }
 	}
@@ -720,7 +717,6 @@ int createNopollConnection(noPollCtx *ctx, server_list_t *server_list)
   struct timespec connect_time,*connectTimePtr;
   connectTimePtr = &connect_time;
   backoff_timer_t backoff_timer;
-  static int init_conn_failure=1;
   
   if(ctx == NULL) {
         return nopoll_false;
@@ -756,14 +752,6 @@ int createNopollConnection(noPollCtx *ctx, server_list_t *server_list)
 	  }
 	  /* if we failed to connect, don't reuse the redirect server */	
       free_server (&conn_ctx.server_list->redirect);
-
-      /* On initial connect failure, invoke conn status change event as "failed" only 1 time*/
-      if((NULL != on_conn_status_change) && init && init_conn_failure)
-      {
-    	  on_conn_status_change("failed");
-	  init_conn_failure=0;
-      }
-
 #ifdef FEATURE_DNS_QUERY
       /* if we don't already have a valid jwt, look up server information */
       if (server_is_null (&conn_ctx.server_list->jwt))
@@ -788,12 +776,6 @@ int createNopollConnection(noPollCtx *ctx, server_list_t *server_list)
 	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)
-	{
-		on_conn_status_change("success");
-	}
-
 	// Invoke the ping status change event callback as "received" ping
 	if(NULL != on_ping_status_change)
 	{
@@ -952,8 +934,3 @@ void registerParodusOnPingStatusChangeHandler(parodusOnPingStatusChangeHandler c
 	on_ping_status_change = callback_func;
 }
 
-void registerParodusOnConnStatusChangeHandler(parodusOnConnStatusChangeHandler callback_func)
-{
-	on_conn_status_change = callback_func;
-}
-

src/connection.h

@@ -37,15 +37,6 @@ extern "C" {
 #define SHUTDOWN_REASON_SYSTEM_RESTART  "system_restarting"
 #define SHUTDOWN_REASON_SIGTERM 		"SIGTERM"
 
-/**
-* parodusOnConnStatusChangeHandler - Function pointer
-* Used to define callback function to do additional processing
-* when websocket cloud connection status change event
-* i.e. "cloud-conn-status" as "fail" or "success"
-*/
-typedef void (*parodusOnConnStatusChangeHandler) (char * status);
-extern parodusOnConnStatusChangeHandler on_conn_status_change;
-
 /**
 * parodusOnPingStatusChangeHandler - Function pointer
 * Used to define callback function to do additional processing 
@@ -88,9 +79,6 @@ void set_cloud_disconnect_time(int disconnTime);
 void start_conn_in_progress (unsigned long start_time);
 void stop_conn_in_progress (void);
 
-// To Register parodusOnConnStatusChangeHandler Callback function
-void registerParodusOnConnStatusChangeHandler(parodusOnConnStatusChangeHandler on_conn_status_change);
-
 // To Register parodusOnPingStatusChangeHandler Callback function
 void registerParodusOnPingStatusChangeHandler(parodusOnPingStatusChangeHandler on_ping_status_change);
 

src/time.c

@@ -34,7 +34,7 @@ uint64_t getCurrentTimeInMicroSeconds(struct timespec *timer)
     ParodusPrint("timer->tv_sec : %lu\n",timer->tv_sec);
     ParodusPrint("timer->tv_nsec : %lu\n",timer->tv_nsec);
     systime = (uint64_t)timer->tv_sec * 1000000L + timer->tv_nsec/ 1000;
-    return systime;
+    return systime;	
 }
 
 long timeValDiff(struct timespec *starttime, struct timespec *finishtime)

src/upstream.h

@@ -47,7 +47,6 @@ typedef struct UpStreamMsg__
 void packMetaData();
 void *handle_upstream();
 void *processUpstreamMessage();
-void registerRBUSlistener();
 int getDeviceId(char **device_id, size_t *device_id_len);
 void sendUpstreamMsgToServer(void **resp_bytes, size_t resp_size);
 void getServiceNameAndSendResponse(wrp_msg_t *msg, void **msg_bytes, size_t msg_size);

src/upstream_rbus.c

@@ -1,125 +0,0 @@
-/**
- * Copyright 2021 Comcast Cable Communications Management, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-/**
- * @file upstream_rbus.c
- *
- * @description This is used for parodus-RBUS communication 
- * to send notification events upstream to cloud.
- *
- */
-
-#include <stdlib.h>
-#include <rbus.h>
-#include "upstream.h"
-#include "ParodusInternal.h"
-#include "partners_check.h"
-
-#define WEBCFG_UPSTREAM_EVENT "Webconfig.Upstream"
-
-void processWebconfigUpstreamEvent(rbusHandle_t handle, rbusEvent_t const* event, rbusEventSubscription_t* subscription);
-
-void subscribeAsyncHandler( rbusHandle_t handle, rbusEventSubscription_t* subscription, rbusError_t error);
-
-/* 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)
-	{
-		ParodusError("rbus_open failed :%s\n", rbusError_ToString(err));
-		return;
-	}
-    rc = rbusEvent_SubscribeAsync(rbus_Handle,WEBCFG_UPSTREAM_EVENT,processWebconfigUpstreamEvent,subscribeAsyncHandler,"parodus",10*60);
-    if(rc != RBUS_ERROR_SUCCESS)
-        ParodusError("rbusEvent_Subscribe failed: %d, %s\n", rc, rbusError_ToString(rc));
-    else
-        ParodusInfo("rbusEvent_Subscribe was successful\n");
-}
-
-void processWebconfigUpstreamEvent(rbusHandle_t handle, rbusEvent_t const* event, rbusEventSubscription_t* subscription)
-{
-    (void)handle;
-    (void)subscription;
-    
-    int rv=-1;
-	wrp_msg_t *event_msg;
-	void *bytes;
-	const uint8_t* bytesVal = NULL;
-    int len;
-    rbusValue_t value = NULL;
-
-    value = rbusObject_GetValue(event->data, "value");
-    bytesVal = rbusValue_GetBytes(value, &len);
-
-	bytes = (void*) bytesVal;
-	rv = wrp_to_struct( bytes, len, WRP_BYTES, &event_msg );
-	if(rv > 0)
-	{
-		ParodusInfo(" Received upstream event data: dest '%s'\n", event_msg->u.event.dest);
-		partners_t *partnersList = NULL;
-		int j = 0;
-
-		int ret = validate_partner_id(event_msg, &partnersList);
-		if(ret == 1)
-		{
-		    wrp_msg_t *eventMsg = (wrp_msg_t *) malloc(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;
-		    eventMsg->u.event.dest=event_msg->u.event.dest;
-		    eventMsg->u.event.payload=event_msg->u.event.payload;
-		    eventMsg->u.event.payload_size=event_msg->u.event.payload_size;
-		    eventMsg->u.event.headers=event_msg->u.event.headers;
-		    eventMsg->u.event.metadata=event_msg->u.event.metadata;
-		    eventMsg->u.event.partner_ids = partnersList;
-
-		   int size = wrp_struct_to( eventMsg, WRP_BYTES, &bytes );
-		   if(size > 0)
-		   {
-		       sendUpstreamMsgToServer(&bytes, size);
-		   }
-		   free(eventMsg);
-		   free(bytes);
-		   bytes = NULL;
-		}
-		else
-		{
-		   sendUpstreamMsgToServer((void **)(&bytes), len);
-		}
-		if(partnersList != NULL)
-		{
-		    for(j=0; j<(int)partnersList->count; j++)
-		    {
-		        if(NULL != partnersList->partner_ids[j])
-		        {
-		             free(partnersList->partner_ids[j]);
-		        }
-		    }
-		    free(partnersList);
-		}
-		partnersList = NULL;
-	}
-}
-
-void subscribeAsyncHandler( rbusHandle_t handle, rbusEventSubscription_t* subscription, rbusError_t error)
-{
-	(void)handle;
-	ParodusInfo("subscribeAsyncHandler event %s, error %d - %s\n",subscription->eventName, error, rbusError_ToString(error));
-}

tests/CMakeLists.txt

@@ -32,10 +32,6 @@ if (FEATURE_DNS_QUERY)
 set (PARODUS_COMMON_LIBS ${PARODUS_COMMON_LIBS} -lucresolv -lresolv)
 endif (FEATURE_DNS_QUERY)
 
-if (ENABLE_WEBCFGBIN)
-set (PARODUS_COMMON_LIBS ${PARODUS_COMMON_LIBS} -lrbus -lrbus-core)
-endif (ENABLE_WEBCFGBIN)
-
 if(NOT DISABLE_VALGRIND)
 set (MEMORY_CHECK valgrind --leak-check=full --show-reachable=yes -v)
 endif ()
@@ -158,11 +154,7 @@ set(CLIST_SRC ${CLIST_SRC} ../src/seshat_interface.c)
 else()
 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)
-endif (ENABLE_WEBCFGBIN)
-
+ 
 add_executable(test_client_list ${CLIST_SRC})
 #target_link_libraries (test_client_list ${PARODUS_CONN_LIBS} ${PARODUS_COMMON_LIBS})
 target_link_libraries (test_client_list ${PARODUS_COMMON_LIBS} -lcurl -luuid)
@@ -180,10 +172,6 @@ else()
 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)
-endif (ENABLE_WEBCFGBIN)
-
 add_executable(test_service_alive ${SVA_SRC})
 #target_link_libraries (test_service_alive ${PARODUS_CONN_LIBS} ${PARODUS_COMMON_LIBS})
 target_link_libraries (test_service_alive ${PARODUS_COMMON_LIBS} -lcurl -luuid)
@@ -306,9 +294,6 @@ set(CONIFC_SRC ${CONIFC_SRC} ../src/seshat_interface.c)
 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)
-endif (ENABLE_WEBCFGBIN)
 add_executable(test_conn_interface ${CONIFC_SRC})
 target_link_libraries (test_conn_interface -lcmocka ${PARODUS_COMMON_LIBS} -lcurl -luuid )
 
@@ -355,10 +340,6 @@ else()
 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)
-endif (ENABLE_WEBCFGBIN)
-
 add_executable(test_token ${TOKEN_SRC} ) 
 #target_link_libraries (test_token ${PARODUS_COMMON_LIBS} ${PARODUS_JWT_LIBS} -lcmocka )
 target_link_libraries (test_token ${PARODUS_COMMON_LIBS} -lcmocka -lcurl -luuid)

tests/test_config.c

@@ -29,7 +29,6 @@
 #include "../src/ParodusInternal.h"
 
 extern int parse_mac_address (char *target, const char *arg);
-extern int parse_serial_num(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, 
@@ -470,14 +469,6 @@ void test_parse_mac_address ()
 	assert_int_equal (parse_mac_address (result, ""), -1);
 }
 
-void test_parse_serial_num()
-{
-	char result[14];
-	assert_int_equal (parse_serial_num (result, "1234ABC00ab"), 0);
-	assert_int_equal (parse_serial_num (result, "$@@"), 0);
-	assert_int_equal (parse_serial_num (result, ""), 0);
-}	
-
 void test_server_is_http ()
 {
 	const char *server_ptr;
@@ -598,7 +589,6 @@ int main(void)
         cmocka_unit_test(err_loadParodusCfg),
         cmocka_unit_test(test_parse_num_arg),
         cmocka_unit_test(test_parse_mac_address),
-	cmocka_unit_test(test_parse_serial_num),
         cmocka_unit_test(test_get_algo_mask),
         cmocka_unit_test(test_server_is_http),
         cmocka_unit_test(test_parse_webpa_url__),

tests/test_conn_interface.c

@@ -44,7 +44,7 @@ pthread_mutex_t svc_mut=PTHREAD_MUTEX_INITIALIZER;
 pthread_cond_t svc_con=PTHREAD_COND_INITIALIZER;
 int numLoops;
 parodusOnPingStatusChangeHandler on_ping_status_change;
-
+ 
 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/
@@ -172,18 +172,6 @@ int serviceAliveTask()
     return 0;
 }
 
-int validate_partner_id(wrp_msg_t *msg, partners_t **partnerIds)
-{
-	UNUSED(msg); UNUSED(partnerIds);
-	return 0;
-}
-
-void sendUpstreamMsgToServer(void **resp_bytes, size_t resp_size)
-{
-	UNUSED(resp_bytes); UNUSED(resp_size);
-	return;
-}
-
 int nopoll_loop_wait(noPollCtx * ctx,long timeout)
 {
     UNUSED(ctx); UNUSED(timeout);
@@ -347,7 +335,6 @@ void test_createSocketConnection()
 
 void test_createSocketConnection1()
 {
-    numLoops =0;
     noPollCtx *ctx;
     ParodusCfg cfg;
     memset(&cfg,0, sizeof(ParodusCfg));
@@ -377,11 +364,11 @@ void test_createSocketConnection1()
     expect_function_call(nopoll_ctx_unref);
     expect_function_call(nopoll_cleanup_library);
     createSocketConnection(NULL);
+    
 }
 
 void test_PingMissIntervalTime()
 {
-    numLoops = 6;
     noPollCtx *ctx;
     ParodusCfg cfg;
     memset(&cfg,0,sizeof(ParodusCfg));
@@ -399,6 +386,7 @@ void test_PingMissIntervalTime()
     //Max ping timeout is 6 sec
     cfg.webpa_ping_timeout = 6;
     set_parodus_cfg(&cfg);
+    
     reset_close_retry();
     expect_function_call(nopoll_thread_handlers);
     
@@ -434,11 +422,11 @@ void test_PingMissIntervalTime()
     expect_function_call(nopoll_ctx_unref);
     expect_function_call(nopoll_cleanup_library);
     createSocketConnection(NULL);
+    
 }
 
 void err_createSocketConnection()
 {
-    numLoops =0;
     set_close_retry();
     reset_heartBeatTimer();
     expect_function_call(nopoll_thread_handlers);
@@ -471,7 +459,6 @@ void err_createSocketConnection()
 
 void test_createSocketConnection_cloud_disconn()
 {
-        numLoops =0;
 	ParodusCfg cfg;
 	memset(&cfg,0,sizeof(ParodusCfg));
 	cfg.cloud_disconnect = strdup("XPC");