enfore connected sockets for TCP, and check for hash table

before dereferencing it

diff --git a/src/lib/io/master.c b/src/lib/io/master.c
index fe89530dd9099de09e5dfe53b802865f1aa939fb..f17a53b49a77e4cdb2d3712b0694aa2dd456f426 100644 (file)
--- a/src/lib/io/master.c
+++ b/src/lib/io/master.c
@@ -1950,9 +1950,11 @@ static void client_expiry_timer(fr_event_list_t *el, fr_time_t now, void *uctx)
                if (connection) {
                        fr_io_client_t *parent = connection->parent;
 
-                       pthread_mutex_lock(&parent->mutex);
-                       (void) fr_hash_table_delete(parent->ht, connection);
-                       pthread_mutex_unlock(&parent->mutex);
+                       if (parent->ht) {
+                               pthread_mutex_lock(&parent->mutex);
+                               (void) fr_hash_table_delete(parent->ht, connection);
+                               pthread_mutex_unlock(&parent->mutex);
+                       }
 
                        /*
                         *      Mark the connection as dead, and tell

diff --git a/src/lib/server/client.c b/src/lib/server/client.c
index 7576f56b4742ca84cb0177b11022584418c12433..17a838d3082846964a7aac5d9028142b3f1a81cc 100644 (file)
--- a/src/lib/server/client.c
+++ b/src/lib/server/client.c
@@ -558,6 +558,11 @@ RADCLIENT_LIST *client_list_parse_section(CONF_SECTION *section, int proto, TLS_
                        return NULL;
                }
 
+               /*
+                *      TCP sockets are always connected.
+                */
+               c->use_connected |= (c->proto == IPPROTO_TCP);
+
 #ifdef WITH_TLS
                /*
                 *      TLS clients CANNOT use non-TLS listeners.