Merge pull request #314 from guruchandru/iface_event

Pause retry during interface down event

CHANGELOG.md

@@ -16,14 +16,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - update to use nopoll v 1.0.2
 - Add pause/resume heartBeatTimer
 - parodus event handler to listen to interface_down and interface_up event
-- Pause connection retry during interface_down event
-- Add callback handler for ping status change event
-- Fixed nopoll_conn_unref crash
-- Update retry timestamp in connection-health-file
-- fix so that parodus can be killed, even if in a connection fail loop
-- provide signal handlers so we shut down properly when INCLUDE_BREAKPAD active
-- send status code and reason in websocket close message
-- dont try to install handler for signal 9 
 
 ## [1.0.2] - 2019-02-08
 - Refactored connection.c and updated corresponding unit tests

README.md

@@ -1,6 +1,6 @@
 # parodus
 
-[![Build Status](https://travis-ci.org/xmidt-org/parodus.svg?branch=master)](https://travis-ci.org/xmidt-org/parodus)
+[![Build Status](https://travis-ci.org/Comcast/parodus.svg?branch=master)](https://travis-ci.org/Comcast/parodus)
 [![codecov.io](http://codecov.io/github/Comcast/parodus/coverage.svg?branch=master)](http://codecov.io/github/Comcast/parodus?branch=master)
 [![Coverity](https://img.shields.io/coverity/scan/11192.svg)](https://scan.coverity.com/projects/comcast-parodus)
 [![Apache V2 License](http://img.shields.io/badge/license-Apache%20V2-blue.svg)](https://github.com/Comcast/parodus/blob/master/LICENSE)

src/ParodusInternal.c

@@ -28,7 +28,6 @@
 bool interface_down_event = false;
 
 pthread_mutex_t interface_down_mut=PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t interface_down_con=PTHREAD_COND_INITIALIZER;
 
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
@@ -165,7 +164,6 @@ void reset_interface_down_event()
 {
 	pthread_mutex_lock (&interface_down_mut);
 	interface_down_event = false;
-	pthread_cond_signal(&interface_down_con);
 	pthread_mutex_unlock (&interface_down_mut);
 }
 
@@ -177,14 +175,6 @@ void set_interface_down_event()
     	pthread_mutex_unlock (&interface_down_mut);
 }
 
-pthread_cond_t *get_interface_down_con(void)
-{
-    return &interface_down_con;
-}
-
-pthread_mutex_t *get_interface_down_mut(void)
-{
-    return &interface_down_mut;
-}
+
 
 

src/ParodusInternal.h

@@ -49,7 +49,6 @@
 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */
 /*----------------------------------------------------------------------------*/
-
 #define UNUSED(x) (void )(x)
 #define NANO_SOCKET_SEND_TIMEOUT_MS                     2000
 #define NANO_SOCKET_RCV_TIMEOUT_MS			500
@@ -108,7 +107,6 @@ typedef struct {
 
 //--- Used in connection.c for backoff delay timer
 typedef struct {
-  struct timespec ts;
   int count;
   int max_count;
   int delay;
@@ -172,10 +170,6 @@ void reset_interface_down_event();
 
 // Set value of interface_down_event to true
 void set_interface_down_event();
-
-pthread_cond_t *get_interface_down_con();
-
-pthread_mutex_t *get_interface_down_mut();
   
 
 #ifdef __cplusplus

src/close_retry.c

@@ -26,6 +26,17 @@
 bool close_retry = false;
 
 pthread_mutex_t close_mut=PTHREAD_MUTEX_INITIALIZER;
+pthread_cond_t close_con=PTHREAD_COND_INITIALIZER;
+
+pthread_cond_t *get_global_close_retry_con(void)
+{
+    return &close_con;
+}
+
+pthread_mutex_t *get_global_close_retry_mut(void)
+{
+    return &close_mut;
+}
 
 // Get value of close_retry
 bool get_close_retry() 
@@ -48,8 +59,9 @@ void reset_close_retry()
 // set value of close_retry to true
 void set_close_retry() 
 {
-	pthread_mutex_lock (&close_mut);
+    pthread_mutex_lock (&close_mut);
     close_retry = true;
+    pthread_cond_signal(&close_con);
     pthread_mutex_unlock (&close_mut);
 }
 

src/close_retry.h

@@ -31,6 +31,12 @@
 extern "C" {
 #endif
 
+// Get the condition variable
+pthread_cond_t *get_global_close_retry_con();
+
+// Get the mutex variable
+pthread_mutex_t *get_global_close_retry_mut();
+
 // Get value of close_retry
 bool get_close_retry();
 

src/conn_interface.c

@@ -148,11 +148,6 @@ void createSocketConnection(void (* initKeypress)())
                 OnboardLog("Reconnect detected, setting Ping_Miss reason for Reconnect\n");
                 set_global_reconnect_reason("Ping_Miss");
                 set_global_reconnect_status(true);
-		// Invoke the ping status change event callback as "missed" ping
-		if(NULL != on_ping_status_change)
-		{ 
-			on_ping_status_change("missed");
-		}
                 set_close_retry();
             }
             else
@@ -168,18 +163,15 @@ void createSocketConnection(void (* initKeypress)())
         if( false == seshat_registered ) {
             seshat_registered = __registerWithSeshat();
         }
-        
-	// If interface down event is set, wait till interface is up again.
-        if (get_interface_down_event ())
-          if (0 != wait_while_interface_down ())
-            break;
-	
+
         if(get_close_retry())
         {
             ParodusInfo("close_retry is %d, hence closing the connection and retrying\n", get_close_retry());
             close_and_unref_connection(get_global_conn());
             set_global_conn(NULL);
 
+            get_parodus_cfg()->cloud_status = CLOUD_STATUS_OFFLINE;
+            ParodusInfo("cloud_status set as %s after connection close\n", get_parodus_cfg()->cloud_status);
             if(get_parodus_cfg()->cloud_disconnect !=NULL)
             {
                 ParodusPrint("get_parodus_cfg()->cloud_disconnect is %s\n", get_parodus_cfg()->cloud_disconnect);
@@ -195,7 +187,7 @@ void createSocketConnection(void (* initKeypress)())
             createNopollConnection(ctx);
             stop_conn_in_progress ();
         }
-       } while(!get_close_retry() && !g_shutdown);
+       } while(!g_shutdown);
 
     pthread_mutex_lock (get_global_svc_mut());
     pthread_cond_signal (get_global_svc_con());
@@ -219,18 +211,13 @@ void createSocketConnection(void (* initKeypress)())
 
     deleteAllClients ();
 
-    ParodusInfo ("reconnect reason at close %s\n", get_global_reconnect_reason());
-    ParodusInfo ("shutdown reason at close %s\n", get_global_shutdown_reason()); 
     close_and_unref_connection(get_global_conn());
     nopoll_ctx_unref(ctx);
     nopoll_cleanup_library();
     curl_global_cleanup();
 }
 
-void shutdownSocketConnection(char *reason) {
-   set_global_shutdown_reason (reason);
+void shutdownSocketConnection(void) {
    g_shutdown = true;
-   reset_interface_down_event ();
-   terminate_backoff_delay ();
 }
 

src/conn_interface.h

@@ -45,7 +45,7 @@ extern UpStreamMsg *UpStreamMsgQ;
  *  and creates the intial connection and manages the connection wait, close mechanisms.
  */
 void createSocketConnection(void (* initKeypress)());
-void shutdownSocketConnection(char *reason);
+void shutdownSocketConnection(void);
    
 #ifdef __cplusplus
 }

src/connection.c

@@ -38,34 +38,11 @@
 
 #define HTTP_CUSTOM_HEADER_COUNT                    	5
 #define INITIAL_CJWT_RETRY                    	-2
-#define UPDATE_HEALTH_FILE_INTERVAL_SECS		450
-
-/* Close codes defined in RFC 6455, section 11.7. */
-enum {
-	CloseNormalClosure           = 1000,
-	CloseGoingAway               = 1001,
-	CloseProtocolError           = 1002,
-	CloseUnsupportedData         = 1003,
-	CloseNoStatus		     = 1005,
-	CloseAbnormalClosure         = 1006,
-	CloseInvalidFramePayloadData = 1007,
-	ClosePolicyViolation         = 1008,
-	CloseMessageTooBig           = 1009,
-	CloseMandatoryExtension      = 1010,
-	CloseInternalServerErr       = 1011,
-	CloseServiceRestart          = 1012,
-	CloseTryAgainLater           = 1013,
-	CloseTLSHandshake            = 1015
-};
 
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
 
-pthread_mutex_t backoff_delay_mut=PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t backoff_delay_con=PTHREAD_COND_INITIALIZER;
-
-static char *shutdown_reason = SHUTDOWN_REASON_PARODUS_STOP;  /* goes in the close message */
 static char *reconnect_reason = "webpa_process_starts";
 static int cloud_disconnect_max_time = 5;
 static noPollConn *g_conn = NULL;
@@ -88,16 +65,6 @@ void set_global_conn(noPollConn *conn)
     g_conn = conn;
 }
 
-char *get_global_shutdown_reason()
-{
-    return shutdown_reason;
-}
-
-void set_global_shutdown_reason(char *reason)
-{
-    shutdown_reason = reason;
-}
-
 char *get_global_reconnect_reason()
 {
     return reconnect_reason;
@@ -232,14 +199,6 @@ 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_REALTIME, &timer->ts);
-}
-
-void terminate_backoff_delay (void)
-{
-	pthread_mutex_lock (&backoff_delay_mut);
-	pthread_cond_signal(&backoff_delay_con);
-	pthread_mutex_unlock (&backoff_delay_mut);
 }
 
 int update_backoff_delay (backoff_timer_t *timer)
@@ -252,50 +211,11 @@ int update_backoff_delay (backoff_timer_t *timer)
   return timer->delay;
 }  
 
-#define BACKOFF_ERR -1
-#define BACKOFF_SHUTDOWN   1
-#define BACKOFF_DELAY_TAKEN 0
-
-void start_conn_in_progress (void);
-
-/* backoff_delay
- * 
- * delays for the number of seconds specified in parameter timer
- * g_shutdown can break out of the delay.
- *
- * returns -1 pthread_cond_timedwait error
- *  1   shutdown
- *  0    delay taken
-*/  
-static int backoff_delay (backoff_timer_t *timer)
+static void backoff_delay (backoff_timer_t *timer)
 {
-  struct timespec ts;
-  int rtn;
-
-  // periodically update the health file.
-  clock_gettime (CLOCK_REALTIME, &ts);
-  if ((ts.tv_sec - timer->ts.tv_sec) >= UPDATE_HEALTH_FILE_INTERVAL_SECS) {
-    start_conn_in_progress ();
-    timer->ts.tv_sec += UPDATE_HEALTH_FILE_INTERVAL_SECS;
-  }	  
-
   update_backoff_delay (timer);
   ParodusInfo("Waiting with backoffRetryTime %d seconds\n", timer->delay);
-  ts.tv_sec += timer->delay;
-
-  pthread_mutex_lock (&backoff_delay_mut);
-  // The condition variable will only be set if we shut down.
-  rtn = pthread_cond_timedwait (&backoff_delay_con, &backoff_delay_mut, &ts);
-  pthread_mutex_unlock (&backoff_delay_mut);
-
-  if (g_shutdown)
-    return BACKOFF_SHUTDOWN;
-  if ((rtn != 0) && (rtn != ETIMEDOUT)) {
-    ParodusError ("pthread_cond_timedwait error (%d) in backoff_delay.\n", rtn);
-    return BACKOFF_ERR;
-  }
-
-  return BACKOFF_DELAY_TAKEN;
+  sleep (timer->delay);
 }  
 
 //--------------------------------------------------------------------
@@ -497,7 +417,7 @@ int nopoll_connect (create_connection_ctx_t *ctx, int is_ipv6)
 
 int wait_connection_ready (create_connection_ctx_t *ctx)
 {
-  int wait_status = 0;
+  int wait_status;
   char *redirectURL = NULL;
 
   if(nopoll_conn_wait_for_status_until_connection_ready(get_global_conn(), 10, 
@@ -600,7 +520,7 @@ int keep_trying_to_connect (create_connection_ctx_t *ctx,
 {
     int rtn;
     
-    while (!g_shutdown)
+    while (true)
     {
       set_extra_headers (ctx);
 
@@ -610,54 +530,13 @@ int keep_trying_to_connect (create_connection_ctx_t *ctx,
 
       if (rtn == CONN_WAIT_ACTION_RETRY) // if redirected or build_headers
         continue;
-
-      // If interface down event is set, stop retry
-      // and wait till interface is up again.
-      if(get_interface_down_event()) {
-	    if (0 != wait_while_interface_down())
-	      return false;
-	    start_conn_in_progress();
-	    ParodusInfo("Interface is back up, re-initializing the convey header\n");
-	    // Reset the reconnect reason by initializing the convey header again
-	    ((header_info_t *)(&ctx->header_info))->conveyHeader = getWebpaConveyHeader();
-	    ParodusInfo("Received reconnect_reason as:%s\n", reconnect_reason);  
-      } else { 
-        if (backoff_delay (backoff_timer) // 3,7,15,31 ..
-              != BACKOFF_DELAY_TAKEN) // shutdown or cond wait error
-          return false;
-      }
-
+      backoff_delay (backoff_timer); // 3,7,15,31 ..
       if (rtn == CONN_WAIT_RETRY_DNS)
         return false;  //find_server again
       // else retry
     }
-    return false;
 }
 
-int wait_while_interface_down()
-
-{
-	int rtn;
-	
-	ParodusError("Interface is down, hence waiting until its up\n");
-	close_and_unref_connection (get_global_conn());
-	set_global_conn(NULL);
-
-	while (get_interface_down_event ()) {
-
-	  pthread_mutex_lock(get_interface_down_mut());
-  	  rtn = pthread_cond_wait(get_interface_down_con(), get_interface_down_mut());
-	  pthread_mutex_unlock (get_interface_down_mut());
-
-  	  if (rtn != 0)
-  	    ParodusError("Error on pthread_cond_wait (%d) in wait_while_interface_down\n", rtn);
-
-  	  if ((rtn != 0) || g_shutdown) 
-	    return -1;
-	  
-	}
-    return 0;
-}
 
 //--------------------------------------------------------------------
 
@@ -700,8 +579,16 @@ int createNopollConnection(noPollCtx *ctx)
 	  set_current_server (&conn_ctx);
 	  if (keep_trying_to_connect (&conn_ctx, &backoff_timer))
 		break;
-
 	  // retry dns query
+
+	  // If close_retry is reset due to interface down event, stop retry
+	  // and wait till close_retry is set again.
+	  if(!get_close_retry() && get_interface_down_event()) {
+		pthread_mutex_lock(get_global_close_retry_mut());
+		pthread_cond_wait(get_global_close_retry_con(), get_global_close_retry_mut());
+		pthread_mutex_unlock (get_global_close_retry_mut());
+		//&conn_ctx.header_info->conveyHeader = getWebpaConveyHeader(); 
+	  }
 	}
       
 	if(conn_ctx.current_server->allow_insecure <= 0)
@@ -718,12 +605,6 @@ int createNopollConnection(noPollCtx *ctx)
 	get_parodus_cfg()->cloud_status = CLOUD_STATUS_ONLINE;
 	ParodusInfo("cloud_status set as %s after successful connection\n", get_parodus_cfg()->cloud_status);
 
-	// Invoke the ping status change event callback as "received" ping
-	if(NULL != on_ping_status_change)
-	{
-		on_ping_status_change("received");
-	}
-
 	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);
@@ -796,16 +677,10 @@ static noPollConnOpts * createConnOpts (char * extra_headers, bool secure)
 void close_and_unref_connection(noPollConn *conn)
 {
     if (conn) {
-      const char *reason = get_global_shutdown_reason();
-      int reason_len = 0;
-      int status = CloseNoStatus;
-      if (NULL != reason) {
-	reason_len = (int) strlen (reason);
-	status = CloseNormalClosure;
-      }
-      nopoll_conn_close_ext(conn, status, reason, reason_len);
-      get_parodus_cfg()->cloud_status = CLOUD_STATUS_OFFLINE;
-      ParodusInfo("cloud_status set as %s after connection close\n", get_parodus_cfg()->cloud_status);
+        nopoll_conn_close(conn);
+        if (0 < nopoll_conn_ref_count (conn)) {
+            nopoll_conn_unref(conn);
+        }
     }
 }
 
@@ -844,9 +719,3 @@ void stop_conn_in_progress (void)
   write_conn_in_prog_file ("STOP");
 }   
 
-
-void registerParodusOnPingStatusChangeHandler(parodusOnPingStatusChangeHandler callback_func)
-{
-	on_ping_status_change = callback_func;
-}
-

src/connection.h

@@ -33,17 +33,7 @@ extern "C" {
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
-#define SHUTDOWN_REASON_PARODUS_STOP    "parodus_stopping"
-#define SHUTDOWN_REASON_SYSTEM_RESTART  "system_restarting"
 
-/**
-* parodusOnPingStatusChangeHandler - Function pointer
-* Used to define callback function to do additional processing 
-* when websocket Ping status change event 
-* i.e. ping_miss or ping receive after miss
-*/
-typedef void (*parodusOnPingStatusChangeHandler) (char * status);
-parodusOnPingStatusChangeHandler on_ping_status_change;
 
 /*----------------------------------------------------------------------------*/
 /*                             Function Prototypes                            */
@@ -59,9 +49,6 @@ void close_and_unref_connection(noPollConn *);
 noPollConn *get_global_conn(void);
 void set_global_conn(noPollConn *);
 
-char *get_global_shutdown_reason();
-void set_global_shutdown_reason(char *reason);
-
 char *get_global_reconnect_reason();
 void set_global_reconnect_reason(char *reason);
 
@@ -77,14 +64,6 @@ void set_cloud_disconnect_time(int disconnTime);
 void start_conn_in_progress (void);
 void stop_conn_in_progress (void);
 
-// To Register parodusOnPingStatusChangeHandler Callback function
-void registerParodusOnPingStatusChangeHandler(parodusOnPingStatusChangeHandler on_ping_status_change);
-
-// To stop connection and wait duing interface down state
-int wait_while_interface_down (void);
-
-void terminate_backoff_delay (void);
-
 #ifdef __cplusplus
 }
 #endif

src/main.c

@@ -19,14 +19,14 @@
 #include "stdlib.h"
 #include "config.h"
 #include "auth_token.h"
-#include "connection.h"
 #include "conn_interface.h"
 #include "parodus_log.h"
 #include <curl/curl.h>
 #ifdef INCLUDE_BREAKPAD
 #include "breakpad_wrapper.h"
-#endif
+#else
 #include "signal.h"
+#endif
 
 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */
@@ -36,7 +36,7 @@
 /*----------------------------------------------------------------------------*/
 /*                               Data Structures                              */
 /*----------------------------------------------------------------------------*/
-typedef    void    Sigfunc(int);
+/* none */
 
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
@@ -46,53 +46,30 @@ typedef    void    Sigfunc(int);
 /*----------------------------------------------------------------------------*/
 /*                             Function Prototypes                            */
 /*----------------------------------------------------------------------------*/
+#ifndef INCLUDE_BREAKPAD
 static void sig_handler(int sig);
-
-Sigfunc *
-signal (int signo, Sigfunc *func)
-{
-    struct sigaction act, oact;
-
-    act.sa_handler = func;
-    sigemptyset (&act.sa_mask);
-    act.sa_flags = 0;
-    if (signo == SIGALRM) {
-#ifdef  SA_INTERRUPT
-        act.sa_flags |= SA_INTERRUPT;     /* SunOS 4.x */
 #endif
-    } else {
-#ifdef  SA_RESTART
-        act.sa_flags |= SA_RESTART; /* SVR4, 4.4BSD */
-#endif
-    }
-    if (sigaction (signo, &act, &oact) < 0) {
-	ParodusError ("Signal Handler for signal %d not installed!\n", signo);
-        return (SIG_ERR);
-    }
-    return (oact.sa_handler);
-}
 
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
 int main( int argc, char **argv)
 {
-    set_global_shutdown_reason (SHUTDOWN_REASON_PARODUS_STOP);
-    signal(SIGTERM, sig_handler);
-    signal(SIGINT, sig_handler);
-	signal(SIGUSR1, sig_handler);
-	signal(SIGUSR2, sig_handler);
-	signal(SIGQUIT, sig_handler);
-	signal(SIGHUP, sig_handler);   
-	signal(SIGALRM, sig_handler);
 #ifdef INCLUDE_BREAKPAD
-    /* breakpad handles the signals SIGSEGV, SIGBUS, SIGFPE, and SIGILL */
     breakpad_ExceptionHandler();
 #else
+    signal(SIGTERM, sig_handler);
+	signal(SIGINT, sig_handler);
+	signal(SIGUSR1, sig_handler);
+	signal(SIGUSR2, sig_handler);
 	signal(SIGSEGV, sig_handler);
 	signal(SIGBUS, sig_handler);
+	signal(SIGKILL, sig_handler);
 	signal(SIGFPE, sig_handler);
 	signal(SIGILL, sig_handler);
+	signal(SIGQUIT, sig_handler);
+	signal(SIGHUP, sig_handler);
+	signal(SIGALRM, sig_handler);
 #endif	
     ParodusCfg *cfg;
 
@@ -120,6 +97,7 @@ const char *rdk_logger_module_fetch(void)
 /*----------------------------------------------------------------------------*/
 /*                             Internal functions                             */
 /*----------------------------------------------------------------------------*/
+#ifndef INCLUDE_BREAKPAD
 static void sig_handler(int sig)
 {
 
@@ -127,13 +105,12 @@ static void sig_handler(int sig)
 	{
 		signal(SIGINT, sig_handler); /* reset it to this function */
 		ParodusInfo("SIGINT received!\n");
-		shutdownSocketConnection(SHUTDOWN_REASON_PARODUS_STOP);
+		shutdownSocketConnection();
 	}
 	else if ( sig == SIGUSR1 ) 
 	{
 		signal(SIGUSR1, sig_handler); /* reset it to this function */
 		ParodusInfo("SIGUSR1 received!\n");
-		shutdownSocketConnection(SHUTDOWN_REASON_SYSTEM_RESTART);
 	}
 	else if ( sig == SIGUSR2 ) 
 	{
@@ -157,7 +134,8 @@ static void sig_handler(int sig)
 	else 
 	{
 		ParodusInfo("Signal %d received!\n", sig);
-		shutdownSocketConnection(SHUTDOWN_REASON_PARODUS_STOP);
+		shutdownSocketConnection();
 	}
 	
 }
+#endif

tests/CMakeLists.txt

@@ -117,13 +117,13 @@ target_link_libraries (test_nopoll_handlers_fragment -lnopoll -lcunit -lcimplog
 #-------------------------------------------------------------------------------
 #   test_connection
 #-------------------------------------------------------------------------------
-add_test(NAME test_connection COMMAND ${MEMORY_CHECK} ./test_connection)
-set (CONN_SRC ../src/connection.c 
-  ../src/string_helpers.c ../src/mutex.c ../src/time.c 
-  ../src/config.c ../src/auth_token.c ../src/spin_thread.c  ../src/heartBeat.c ../src/close_retry.c)
+#add_test(NAME test_connection COMMAND ${MEMORY_CHECK} ./test_connection)
+#set (CONN_SRC ../src/connection.c 
+#  ../src/string_helpers.c ../src/mutex.c ../src/time.c 
+#  ../src/config.c ../src/auth_token.c ../src/spin_thread.c  ../src/heartBeat.c ../src/close_retry.c)
 #set(CONN_SRC ../src/connection.c ${PARODUS_COMMON_SRC})
-add_executable(test_connection test_connection.c ${CONN_SRC})
-target_link_libraries (test_connection ${PARODUS_COMMON_LIBS} -lcmocka -lcurl -luuid)
+#add_executable(test_connection test_connection.c ${CONN_SRC})
+#target_link_libraries (test_connection ${PARODUS_COMMON_LIBS} -lcmocka -lcurl -luuid)
 
 #-------------------------------------------------------------------------------
 #   test_connection - function createNopollConnection

tests/test_conn_interface.c

@@ -33,7 +33,6 @@
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
-static char *reconnect_reason = "webpa_process_starts";
 UpStreamMsg *UpStreamMsgQ;
 ParodusMsg *ParodusMsgQ;
 pthread_mutex_t g_mutex=PTHREAD_MUTEX_INITIALIZER;
@@ -76,21 +75,6 @@ noPollMutexUnlock 	mutex_unlock
     function_called();
 }
 
-char *get_global_reconnect_reason()
-{
-    return reconnect_reason;
-}
-
-char *get_global_shutdown_reason()
-{
-    return SHUTDOWN_REASON_PARODUS_STOP;
-}
-
-void set_global_shutdown_reason(char *reason)
-{
-    UNUSED(reason);
-}
-
 void start_conn_in_progress (void)
 {
 }   
@@ -99,24 +83,6 @@ void stop_conn_in_progress (void)
 {
 }   
 
-void reset_interface_down_event (void)
-{
-}
-
-bool get_interface_down_event (void)
-{
-	return false;
-}
-
-int wait_while_interface_down (void)
-{
-	return 0;
-}
-
-void terminate_backoff_delay (void)
-{
-}
-
 void packMetaData()
 {
     function_called();
@@ -343,6 +309,7 @@ void test_createSocketConnection1()
     expect_function_call(nopoll_ctx_unref);
     expect_function_call(nopoll_cleanup_library);
     createSocketConnection(NULL);
+    assert_string_equal(get_parodus_cfg()->cloud_status, CLOUD_STATUS_OFFLINE);
     
 }
 

tests/test_connection.c

@@ -24,7 +24,6 @@
 #include <assert.h>
 #include <CUnit/Basic.h>
 #include <nopoll.h>
-#include <pthread.h>
 
 #include "../src/ParodusInternal.h"
 #include "../src/connection.h"
@@ -61,10 +60,7 @@ extern int keep_trying_to_connect (create_connection_ctx_t *ctx,
 
 bool close_retry;
 bool LastReasonStatus;
-bool interface_down_event = false;
-pthread_mutex_t close_mut; 
-pthread_mutex_t interface_down_mut=PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t interface_down_con=PTHREAD_COND_INITIALIZER;
+pthread_mutex_t close_mut;
 
 // Mock values
 bool g_shutdown = false;
@@ -84,35 +80,6 @@ char* getWebpaConveyHeader()
     return (char*) "WebPA-1.6 (TG1682)";
 }
 
-
-void set_interface_down_event()
-{
-        interface_down_event = true;
-}
-
-void reset_interface_down_event() 
-{
-	pthread_mutex_lock (&interface_down_mut);
-	interface_down_event = false;
-	pthread_cond_signal(&interface_down_con);
-	pthread_mutex_unlock (&interface_down_mut);
-}
-
-bool get_interface_down_event() 
-{
-	return interface_down_event;
-}
-
-pthread_cond_t *get_interface_down_con(void)
-{
-    return &interface_down_con;
-}
-
-pthread_mutex_t *get_interface_down_mut(void)
-{
-    return &interface_down_mut;
-}
-
 noPollConn * nopoll_conn_new_opts (noPollCtx  * ctx, noPollConnOpts  * opts, const char  * host_ip, const char  * host_port, const char  * host_name,const char  * get_url,const char  * protocols, const char * origin)
 {
     UNUSED(host_port); UNUSED(host_name); UNUSED(get_url); UNUSED(protocols); 
@@ -181,9 +148,11 @@ void nopoll_conn_close (noPollConn *conn)
     UNUSED(conn);
 }
 
-void nopoll_conn_close_ext (noPollConn *conn, int status, const char *reason, int reason_size)
+int nopoll_conn_ref_count (noPollConn *conn)
 {
-    UNUSED(conn); UNUSED(status); UNUSED(reason); UNUSED(reason_size);
+    UNUSED(conn);
+    function_called ();
+    return (nopoll_bool) mock();
 }
 
 int checkHostIp(char * serverIP)
@@ -231,7 +200,6 @@ int allow_insecure_conn (char **server_addr, unsigned int *port)
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/
 
-
 void test_get_global_conn()
 {
     assert_null(get_global_conn());
@@ -727,6 +695,8 @@ void test_connect_and_wait ()
   expect_function_call (nopoll_conn_is_ok);
   will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
   expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
   assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_RETRY_DNS);
 
   Cfg.flags = 0;
@@ -736,6 +706,8 @@ void test_connect_and_wait ()
   expect_function_call (nopoll_conn_new_opts);
   will_return (nopoll_conn_is_ok, nopoll_false);
   expect_function_call (nopoll_conn_is_ok);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
   assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_RETRY_DNS);
 
   will_return (nopoll_conn_new_opts, &connection1);
@@ -773,6 +745,8 @@ void test_connect_and_wait ()
   expect_function_call (nopoll_conn_tls_new6);
   will_return (nopoll_conn_is_ok, nopoll_false);
   expect_function_call (nopoll_conn_is_ok);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
   will_return (nopoll_conn_tls_new, NULL);
   expect_function_call (nopoll_conn_tls_new);
   will_return (checkHostIp, 0);
@@ -783,6 +757,8 @@ void test_connect_and_wait ()
   expect_function_call (nopoll_conn_tls_new6);
   will_return (nopoll_conn_is_ok, nopoll_false);
   expect_function_call (nopoll_conn_is_ok);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
   will_return (nopoll_conn_tls_new, &connection1);
   expect_function_call (nopoll_conn_tls_new);
   will_return (nopoll_conn_is_ok, nopoll_true);
@@ -802,6 +778,8 @@ void test_connect_and_wait ()
   mock_redirect = "mydns.mycom.net";
   will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
   expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
   assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_RETRY_DNS);
 
   will_return (nopoll_conn_tls_new, &connection1);
@@ -812,6 +790,8 @@ void test_connect_and_wait ()
   mock_redirect = "https://mydns.mycom.net";
   will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
   expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
   assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_ACTION_RETRY);
 }
 
@@ -863,6 +843,8 @@ void test_keep_trying ()
   mock_redirect = "https://mydns.mycom.net";
   will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
   expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
   will_return (nopoll_conn_tls_new, &connection1);
   expect_function_call (nopoll_conn_tls_new);
   will_return (nopoll_conn_is_ok, nopoll_true);
@@ -881,12 +863,16 @@ void test_keep_trying ()
   mock_redirect = "https://mydns.mycom.net";
   will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
   expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
   will_return (nopoll_conn_tls_new, &connection1);
   expect_function_call (nopoll_conn_tls_new);
   will_return (nopoll_conn_is_ok, nopoll_true);
   expect_function_call (nopoll_conn_is_ok);
   will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
   expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
   init_backoff_timer (&backoff_timer, 5);
   rtn = keep_trying_to_connect (&ctx, &backoff_timer);
   assert_int_equal (rtn, false);
@@ -909,6 +895,8 @@ void test_keep_trying ()
   expect_function_call (nopoll_conn_is_ok);
   will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
   expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
   init_backoff_timer (&backoff_timer, 5);
   rtn = keep_trying_to_connect (&ctx, &backoff_timer);
   assert_int_equal (rtn, false);
@@ -958,6 +946,8 @@ void test_create_nopoll_connection()
   expect_function_call (nopoll_conn_tls_new6);
   will_return (nopoll_conn_is_ok, nopoll_false);
   expect_function_call (nopoll_conn_is_ok);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
   will_return (nopoll_conn_tls_new, &connection1);
   expect_function_call (nopoll_conn_tls_new);
   will_return (nopoll_conn_is_ok, nopoll_true);
@@ -971,6 +961,8 @@ void test_create_nopoll_connection()
   expect_function_call (nopoll_conn_tls_new6);
   will_return (nopoll_conn_is_ok, nopoll_false);
   expect_function_call (nopoll_conn_is_ok);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
   will_return (nopoll_conn_tls_new, &connection1);
   expect_function_call (nopoll_conn_tls_new);
   will_return (nopoll_conn_is_ok, nopoll_true);
@@ -979,11 +971,15 @@ void test_create_nopoll_connection()
   mock_redirect = "https://mydns.mycom.net";
   will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
   expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
 
   will_return (nopoll_conn_tls_new6, &connection1);
   expect_function_call (nopoll_conn_tls_new6);
   will_return (nopoll_conn_is_ok, nopoll_false);
   expect_function_call (nopoll_conn_is_ok);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
   will_return (nopoll_conn_tls_new, &connection1);
   expect_function_call (nopoll_conn_tls_new);
   will_return (nopoll_conn_is_ok, nopoll_true);
@@ -1027,6 +1023,8 @@ void test_create_nopoll_connection()
   expect_function_call (nopoll_conn_tls_new6);
   will_return (nopoll_conn_is_ok, nopoll_false);
   expect_function_call (nopoll_conn_is_ok);
+  will_return (nopoll_conn_ref_count, 0);
+  expect_function_call (nopoll_conn_ref_count);
   mock_wait_status = 0;
   will_return (nopoll_conn_tls_new, &connection1);
   expect_function_call (nopoll_conn_tls_new);
@@ -1040,149 +1038,6 @@ void test_create_nopoll_connection()
 
 }
 
-void test_get_interface_down_event()
-{
-    assert_false(get_interface_down_event());
-    set_interface_down_event();
-}
-
-void *a()
-{   
-    sleep(15);
-    reset_interface_down_event();
-    pthread_exit(0);
-    return NULL;
-}
-
-
-void test_interface_down_retry()
-{ 
-  int rtn;
-  ParodusCfg cfg;
-  noPollCtx test_nopoll_ctx;
-  pthread_t thread_a;
-
-  pthread_create(&thread_a, NULL, a, NULL);
-
-  memset(&cfg,0,sizeof(cfg));
-  cfg.flags = 0;
-  parStrncpy (cfg.webpa_url, "mydns.mycom.net:8080", sizeof(cfg.webpa_url));
-  cfg.boot_time = 25;
-  parStrncpy (cfg.hw_last_reboot_reason, "Test reason", sizeof(cfg.hw_last_reboot_reason));
-  cfg.webpa_backoff_max = 30;
-  parStrncpy (cfg.webpa_auth_token, "Auth---", sizeof (cfg.webpa_auth_token));
-  parStrncpy(cfg.hw_model, "TG1682", sizeof(cfg.hw_model));
-  parStrncpy(cfg.hw_manufacturer , "ARRISGroup,Inc.", sizeof(cfg.hw_manufacturer));
-  parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
-  parStrncpy(cfg.fw_name , "2.364s2", sizeof(cfg.fw_name));
-  parStrncpy(cfg.webpa_protocol , "WebPA-1.6", sizeof(cfg.webpa_protocol));
-  set_parodus_cfg(&cfg);
-  rtn = createNopollConnection (&test_nopoll_ctx);
-  assert_int_equal (rtn, nopoll_false);
-
-  parStrncpy (cfg.webpa_url, "http://mydns.mycom.net:8080", sizeof(cfg.webpa_url));
-  set_parodus_cfg(&cfg);
-
-  mock_wait_status = 0;
-  
-  will_return (nopoll_conn_new_opts, &connection1);
-  expect_function_call (nopoll_conn_new_opts);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  rtn = createNopollConnection (&test_nopoll_ctx);
-  assert_int_equal (rtn, nopoll_true);
-
-  parStrncpy (cfg.webpa_url, "https://mydns.mycom.net:8080", sizeof(cfg.webpa_url));
-  cfg.flags = 0;
-  set_parodus_cfg(&cfg);
-
-  will_return (nopoll_conn_tls_new6, &connection1);
-  expect_function_call (nopoll_conn_tls_new6);
-  will_return (nopoll_conn_is_ok, nopoll_false);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  rtn = createNopollConnection (&test_nopoll_ctx);
-  assert_int_equal (rtn, nopoll_true);
-
-  will_return (nopoll_conn_tls_new6, &connection1);
-  expect_function_call (nopoll_conn_tls_new6);
-  will_return (nopoll_conn_is_ok, nopoll_false);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  mock_wait_status = 302;
-  mock_redirect = "https://mydns.mycom.net";
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-
-  will_return (nopoll_conn_tls_new6, &connection1);
-  expect_function_call (nopoll_conn_tls_new6);
-  will_return (nopoll_conn_is_ok, nopoll_false);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  mock_wait_status = 0;
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  rtn = createNopollConnection (&test_nopoll_ctx);
-  assert_int_equal (rtn, nopoll_true);
-
-#ifdef FEATURE_DNS_QUERY
-  cfg.acquire_jwt = 1;
-  cfg.flags = FLAGS_IPV4_ONLY;
-  set_parodus_cfg(&cfg);
-  
-  will_return (allow_insecure_conn, -1);
-  expect_function_call (allow_insecure_conn);
-  will_return (nopoll_conn_tls_new, NULL);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (checkHostIp, 0);
-  expect_function_call (checkHostIp);
-  mock_server_addr = "mydns.myjwtcom.net";
-  mock_port = 80;
-  will_return (allow_insecure_conn, 0);
-  expect_function_call (allow_insecure_conn);
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  rtn = createNopollConnection (&test_nopoll_ctx);
-  assert_int_equal (rtn, nopoll_true);
-    
-  cfg.flags = 0;
-  set_parodus_cfg(&cfg);
-
-  will_return (allow_insecure_conn, -1);
-  expect_function_call (allow_insecure_conn);
-  will_return (nopoll_conn_tls_new6, &connection1);
-  expect_function_call (nopoll_conn_tls_new6);
-  will_return (nopoll_conn_is_ok, nopoll_false);
-  expect_function_call (nopoll_conn_is_ok);
-  mock_wait_status = 0;
-  will_return (nopoll_conn_tls_new, &connection1);
-  expect_function_call (nopoll_conn_tls_new);
-  will_return (nopoll_conn_is_ok, nopoll_true);
-  expect_function_call (nopoll_conn_is_ok);
-  will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_true);
-  expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-  rtn = createNopollConnection (&test_nopoll_ctx);
-  assert_int_equal (rtn, nopoll_true);
-#endif
-   pthread_join(thread_a, NULL);
-} 
 
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
@@ -1210,9 +1065,7 @@ int main(void)
         cmocka_unit_test(test_wait_connection_ready),
         cmocka_unit_test(test_connect_and_wait),
         cmocka_unit_test(test_keep_trying),
-	cmocka_unit_test(test_create_nopoll_connection),
-        cmocka_unit_test(test_get_interface_down_event),
-        cmocka_unit_test(test_interface_down_retry)
+	cmocka_unit_test(test_create_nopoll_connection)
     };
 
     return cmocka_run_group_tests(tests, NULL, NULL);

tests/test_nopoll_handlers.c

@@ -30,11 +30,8 @@
 /*----------------------------------------------------------------------------*/
 volatile unsigned int heartBeatTimer;
 bool LastReasonStatus;
-bool interface_down_event = false;
 int closeReason = 0;
-pthread_mutex_t close_mut; 
-pthread_mutex_t interface_down_mut=PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t interface_down_con=PTHREAD_COND_INITIALIZER;
+pthread_mutex_t close_mut;
 bool close_retry;
 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
@@ -50,22 +47,9 @@ bool get_global_reconnect_status()
     return LastReasonStatus;
 }
 
-void set_interface_down_event()
+bool get_interface_down_event()
 {
-        interface_down_event = true;
-}
-
-void reset_interface_down_event() 
-{
-	pthread_mutex_lock (&interface_down_mut);
-	interface_down_event = false;
-	pthread_cond_signal(&interface_down_con);
-	pthread_mutex_unlock (&interface_down_mut);
-}
-
-bool get_interface_down_event() 
-{
-	return interface_down_event;
+     return false;
 }
 
 void set_global_reconnect_status(bool status)
@@ -201,30 +185,6 @@ void test_listenerOnPingMessage()
     listenerOnPingMessage(NULL, NULL, NULL, NULL);
 }
 
-void test_getInterfaceDownEvent()
-{   
-    set_interface_down_event();
-    CU_ASSERT_TRUE(get_interface_down_event());
-}
-
-void test_interfaceDownEvent()
-{
-    char str[] = "SSL_Socket_Close";
-    set_global_reconnect_status(true);
-    set_interface_down_event();
-    listenerOnCloseMessage(NULL, NULL, (noPollPtr) str);
-    
-}
-
-void test_noInterfaceDownEvent()
-{
-    char str[] = "SSL_Socket_Close";
-    set_global_reconnect_status(true);
-    reset_interface_down_event();
-    listenerOnCloseMessage(NULL, NULL, (noPollPtr) str);
-}
-
-
 void add_suites( CU_pSuite *suite )
 {
     ParodusInfo("--------Start of Test Cases Execution ---------\n");
@@ -232,9 +192,6 @@ void add_suites( CU_pSuite *suite )
     CU_add_test( *suite, "Test 1", test_listenerOnMessage_queue );
     CU_add_test( *suite, "Test 2", test_listenerOnCloseMessage );
     CU_add_test( *suite, "Test 3", test_listenerOnPingMessage );
-    CU_add_test( *suite, "Test 4", test_getInterfaceDownEvent );
-    CU_add_test( *suite, "Test 5", test_interfaceDownEvent );
-    CU_add_test( *suite, "Test 6", test_noInterfaceDownEvent );
 }
 
 /*----------------------------------------------------------------------------*/