session server ch BUGFIX check ch thread running

When ch sess is established, only the status of the sess was checked in
a loop, which isn't enough when we just delete a CH client from the
config without the client gracefully closing first.

Author: Roytak

src/session_server.c

@@ -3298,6 +3298,35 @@ nc_server_ch_client_get_idle_timeout(const char *client_name, uint32_t *idle_tim
     return ret;
 }
 
+/**
+ * @brief Checks if a Call Home thread should terminate.
+ *
+ * Checks the shared boolean variable thread_running. This should be done everytime
+ * before entering a critical section.
+ *
+ * @param[in] data Call Home thread's data.
+ *
+ * @return 0 if the thread should stop running, -1 if it can continue.
+ */
+static int
+nc_server_ch_client_thread_is_running(struct nc_server_ch_thread_arg *data)
+{
+    int ret = -1;
+
+    /* COND LOCK */
+    if (nc_mutex_lock(&data->cond_lock, NC_CH_COND_LOCK_TIMEOUT, __func__) != 1) {
+        return ret;
+    }
+    if (!data->thread_running) {
+        /* thread should stop running */
+        ret = 0;
+    }
+    /* COND UNLOCK */
+    nc_mutex_unlock(&data->cond_lock, __func__);
+
+    return ret;
+}
+
 /**
  * @brief Wait for any event after a NC session was established on a CH client.
  *
@@ -3392,7 +3421,7 @@ nc_server_ch_client_thread_session_cond_wait(struct nc_server_ch_thread_arg *dat
             session->status = NC_STATUS_INVALID;
             session->term_reason = NC_SESSION_TERM_TIMEOUT;
         }
-    } while (session->status == NC_STATUS_RUNNING);
+    } while ((session->status == NC_STATUS_RUNNING) && nc_server_ch_client_thread_is_running(data));
     /* broke out of the loop, but still holding the ch_lock */
 
     /* signal to nc_session_free() that CH thread is terminating */
@@ -3450,35 +3479,6 @@ nc_server_ch_client_thread_is_running_wait(struct nc_session *session, struct nc
     return ret;
 }
 
-/**
- * @brief Checks if a Call Home thread should terminate.
- *
- * Checks the shared boolean variable thread_running. This should be done everytime
- * before entering a critical section.
- *
- * @param[in] data Call Home thread's data.
- *
- * @return 0 if the thread should stop running, -1 if it can continue.
- */
-static int
-nc_server_ch_client_thread_is_running(struct nc_server_ch_thread_arg *data)
-{
-    int ret = -1;
-
-    /* COND LOCK */
-    if (nc_mutex_lock(&data->cond_lock, NC_CH_COND_LOCK_TIMEOUT, __func__) != 1) {
-        return ret;
-    }
-    if (!data->thread_running) {
-        /* thread should stop running */
-        ret = 0;
-    }
-    /* COND UNLOCK */
-    nc_mutex_unlock(&data->cond_lock, __func__);
-
-    return ret;
-}
-
 /**
  * @brief Wait for a Call Home client to have at least one endpoint defined.
  *