session BUGFIX timeout of CH session free

Author: michalvasko

src/session.c

@@ -741,26 +741,27 @@ nc_session_free(struct nc_session *session, void (*data_free)(void *))
     /* mark session for closing */
     session->status = NC_STATUS_CLOSING;
 
-    if ((session->side == NC_SERVER) && (session->flags & NC_SESSION_CALLHOME)) {
+    if ((session->side == NC_SERVER) && (session->flags & NC_SESSION_CH_THREAD)) {
         pthread_cond_signal(&session->opts.server.ch_cond);
 
         nc_gettimespec_real(&ts);
         nc_addtimespec(&ts, NC_SESSION_FREE_LOCK_TIMEOUT);
 
         /* wait for CH thread to actually wake up and terminate */
         r = 0;
-        while (!r && (session->flags & NC_SESSION_CALLHOME)) {
+        while (!r && (session->flags & NC_SESSION_CH_THREAD)) {
             r = pthread_cond_timedwait(&session->opts.server.ch_cond, &session->opts.server.ch_lock, &ts);
         }
-
-        /* CH UNLOCK */
-        pthread_mutex_unlock(&session->opts.server.ch_lock);
-
         if (r) {
             ERR(session, "Waiting for Call Home thread failed (%s).", strerror(r));
         }
     }
 
+    if ((session->side == NC_SERVER) && (session->flags & NC_SESSION_CALLHOME)) {
+        /* CH UNLOCK */
+        pthread_mutex_unlock(&session->opts.server.ch_lock);
+    }
+
     connected = nc_session_is_connected(session);
 
     /* transport implementation cleanup */

src/session_p.h

@@ -432,7 +432,8 @@ struct nc_session {
     void *data;                    /**< arbitrary user data */
     uint8_t flags;                 /**< various flags of the session */
 #define NC_SESSION_SHAREDCTX 0x01
-#define NC_SESSION_CALLHOME 0x02
+#define NC_SESSION_CALLHOME 0x02    /**< session is Call Home and ch_lock is initialized */
+#define NC_SESSION_CH_THREAD 0x04   /**< protected by ch_lock */
 
     union {
         struct {
@@ -446,7 +447,7 @@ struct nc_session {
 
             /* client flags */
             /* some server modules failed to load so the data from them will be ignored - not use strict flag for parsing */
-#           define NC_SESSION_CLIENT_NOT_STRICT 0x40
+#           define NC_SESSION_CLIENT_NOT_STRICT 0x08
         } client;
         struct {
             /* server side only data */
@@ -465,13 +466,13 @@ struct nc_session {
             /* server flags */
 #ifdef NC_ENABLED_SSH
             /* SSH session authenticated */
-#           define NC_SESSION_SSH_AUTHENTICATED 0x04
+#           define NC_SESSION_SSH_AUTHENTICATED 0x10
             /* netconf subsystem requested */
-#           define NC_SESSION_SSH_SUBSYS_NETCONF 0x08
+#           define NC_SESSION_SSH_SUBSYS_NETCONF 0x20
             /* new SSH message arrived */
-#           define NC_SESSION_SSH_NEW_MSG 0x10
+#           define NC_SESSION_SSH_NEW_MSG 0x40
             /* this session is passed to nc_sshcb_msg() */
-#           define NC_SESSION_SSH_MSG_CB 0x20
+#           define NC_SESSION_SSH_MSG_CB 0x80
 
             uint16_t ssh_auth_attempts;    /**< number of failed SSH authentication attempts */
 #endif

src/session_server.c

@@ -3389,12 +3389,12 @@ nc_server_ch_client_thread_session_cond_wait(struct nc_session *session, struct
     /* CH LOCK */
     pthread_mutex_lock(&session->opts.server.ch_lock);
 
-    session->flags |= NC_SESSION_CALLHOME;
+    session->flags |= NC_SESSION_CH_THREAD;
 
     /* give the session to the user */
     if (data->new_session_cb(data->client_name, session)) {
         /* something is wrong, free the session */
-        session->flags &= ~NC_SESSION_CALLHOME;
+        session->flags &= ~NC_SESSION_CH_THREAD;
 
         /* CH UNLOCK */
         pthread_mutex_unlock(&session->opts.server.ch_lock);
@@ -3449,8 +3449,9 @@ nc_server_ch_client_thread_session_cond_wait(struct nc_session *session, struct
 
     } while (session->status == NC_STATUS_RUNNING);
 
-    /* signal to nc_session_free() that CH registered this session not being valid anymore */
-    session->flags &= ~NC_SESSION_CALLHOME;
+    /* signal to nc_session_free() that CH thread is terminating */
+    session->flags &= ~NC_SESSION_CH_THREAD;
+    pthread_cond_signal(&session->opts.server.ch_cond);
 
     /* CH UNLOCK */
     pthread_mutex_unlock(&session->opts.server.ch_lock);