quic: free timed out conn when not keep_timed_out

Author: akhinvasara-jumptrading

src/waltz/quic/fd_quic.c

@@ -2969,17 +2969,20 @@ fd_quic_handle_crypto_frame( fd_quic_frame_ctx_t *    context,
 static int
 fd_quic_conn_free_resources( fd_quic_t * quic, fd_quic_conn_t * conn );
 
-static void
+/* Returns new conn state */
+static uint
 fd_quic_timeout_conn( fd_quic_t * quic, fd_quic_conn_t * conn ) {
+  quic->metrics.conn_timeout_cnt++;
   if( quic->config.keep_timed_out ) {
     fd_quic_state_t * state = fd_quic_get_state( quic );
     fd_quic_conn_free_resources( quic, conn );
     fd_quic_set_conn_state( conn, FD_QUIC_CONN_STATE_TIMED_OUT );
     fd_quic_svc_schedule( state, conn, FD_QUIC_SVC_TIMEOUT );
+    return FD_QUIC_CONN_STATE_TIMED_OUT;
   } else {
     fd_quic_set_conn_state( conn, FD_QUIC_CONN_STATE_DEAD );
+    return FD_QUIC_CONN_STATE_DEAD;
   }
-  quic->metrics.conn_timeout_cnt++;
 }
 
 static int
@@ -2991,7 +2994,7 @@ fd_quic_svc_poll( fd_quic_t *      quic,
                    conn->state == FD_QUIC_CONN_STATE_TIMED_OUT ) ) {
     /* connection shouldn't have been scheduled,
        and is now removed, so just continue */
-    FD_LOG_ERR(( "Bad conn in schedule (svc_type=%u), state=%s", conn->svc_type, conn->state==FD_QUIC_CONN_STATE_INVALID ? "INVALID" : "TIMED_OUT" ));
+    FD_LOG_CRIT(( "Bad conn in schedule (svc_type=%u), state=%s", conn->svc_type, conn->state==FD_QUIC_CONN_STATE_INVALID ? "INVALID" : "TIMED_OUT" ));
     return 1;
   }
 
@@ -3010,8 +3013,9 @@ fd_quic_svc_poll( fd_quic_t *      quic,
             conn->server?"SERVER":"CLIENT",
             (void *)conn, conn->conn_idx, (double)fd_quic_ticks_to_us(conn->idle_timeout_ticks) / 1e3 )); )
 
-        fd_quic_timeout_conn( quic, conn );
-        return 1;
+        /* Handle timeout based on config. If left as TIMED_OUT rather than DEAD,
+           don't bother servicing further */
+        if( fd_quic_timeout_conn( quic, conn )==FD_QUIC_CONN_STATE_TIMED_OUT ) return 1;
       }
     } else if( quic->config.keep_alive & !!(conn->let_die_ticks > now) ) {
       /* send PING */

src/waltz/quic/tests/test_quic_keep_alive.c

@@ -6,6 +6,8 @@ int server_complete = 0;
 int client_complete = 0;
 fd_quic_conn_t * server_conn = NULL;
 
+int called_final = 0;
+
 void
 my_connection_new( fd_quic_conn_t * conn FD_PARAM_UNUSED,
                    void *           vp_context FD_PARAM_UNUSED ) {
@@ -19,6 +21,12 @@ my_handshake_complete( fd_quic_conn_t * conn FD_PARAM_UNUSED,
   client_complete = 1;
 }
 
+void
+my_connection_final( fd_quic_conn_t * conn       FD_PARAM_UNUSED,
+                     void           * vp_context FD_PARAM_UNUSED ) {
+  called_final = 1;
+}
+
 /* global "clock" */
 ulong now = 145;
 
@@ -83,6 +91,7 @@ walk_timeout_period( fd_quic_t * client_quic, fd_quic_t * server_quic, int eight
 static void
 test_quic_keep_alive( fd_quic_t * client_quic, fd_quic_t * server_quic, int keep_alive ) {
 
+  called_final = 0;
   client_quic->config.keep_alive = keep_alive;
   test_init( client_quic, server_quic );
 
@@ -92,18 +101,21 @@ test_quic_keep_alive( fd_quic_t * client_quic, fd_quic_t * server_quic, int keep
   } else {
     FD_TEST( server_conn->state == FD_QUIC_CONN_STATE_INVALID ||
              server_conn->state == FD_QUIC_CONN_STATE_DEAD );
+    FD_TEST( called_final );
   }
 }
 
 static void
 test_quic_let_die( fd_quic_t * client_quic, fd_quic_t * server_quic ) {
+  called_final = 0;
   ulong    const   timestep    = client_quic->config.idle_timeout>>3;
   fd_quic_conn_t * client_conn = test_init( client_quic, server_quic );
 
   fd_quic_conn_let_die( client_conn, timestep );
   walk_timeout_period( client_quic, server_quic, 8 );
   FD_TEST( server_conn->state == FD_QUIC_CONN_STATE_INVALID ||
            server_conn->state == FD_QUIC_CONN_STATE_DEAD );
+  FD_TEST( called_final );
 }
 
 static void
@@ -247,6 +259,7 @@ main( int argc, char ** argv ) {
 
   server_quic->cb.conn_new         = my_connection_new;
   client_quic->cb.conn_hs_complete = my_handshake_complete;
+  server_quic->cb.conn_final       = my_connection_final;
 
   server_quic->config.initial_rx_max_stream_data = 1<<16;
   client_quic->config.initial_rx_max_stream_data = 1<<16;