QUIC nits

replay/dnssim/CMakeLists.txt

@@ -9,18 +9,13 @@ option(DNSJIT_PATH "Path to dnsjit prefix" "")
 option(ASAN "Use AddressSanitizer" OFF)
 option(UBSAN "Use UndefinedBehaviorSanitizer" OFF)
 option(USE_SYSTEM_NGTCP2 "Use ngtcp2 from the system" OFF)
-option(ENABLE_GNUTLS "Whether GnuTLS support is enabled" ON)
 
 
 ## Dependencies ################################################################
 
 # GnuTLS
-if (ENABLE_GNUTLS)
-	find_package(GnuTLS REQUIRED)
-	list(APPEND DNSSIM_LIBS GnuTLS::GnuTLS)
-else ()
-	list(APPEND DNSSIM_OPTS -DDNSSIM_HAS_GNUTLS=0)
-endif ()
+find_package(GnuTLS REQUIRED)
+list(APPEND DNSSIM_LIBS GnuTLS::GnuTLS)
 
 # LibUV
 find_library(LIBUV_LIB libuv.so REQUIRED)

replay/dnssim/src/output/dnssim/connection.c

@@ -265,10 +265,10 @@ void _output_dnssim_conn_move_queries_to_pending(_output_dnssim_query_stream_t**
 
 static void _send_pending_queries(_output_dnssim_connection_t* conn)
 {
-    output_dnssim_t* self = conn->client->dnssim;
     _output_dnssim_query_stream_t* qry;
     mlassert(conn, "conn is nil");
     mlassert(conn->client, "conn->client is nil");
+    output_dnssim_t* self = conn->client->dnssim;
     qry = (_output_dnssim_query_stream_t*)conn->client->pending;
 
     while (qry != NULL && (conn->state == _OUTPUT_DNSSIM_CONN_ACTIVE || conn->state == _OUTPUT_DNSSIM_CONN_EARLY_DATA)) {
@@ -519,7 +519,6 @@ static int _process_dnsmsg(_output_dnssim_connection_t* conn,
         lassert(conn->quic, "conn must have quic ctx");
         lassert(stream->stream_id >= 0, "quic stream must have a non-negative id");
 
-        /* TODO - maybe assign the query pointer to the stream? */
         qry = &_output_dnssim_get_stream_query(conn, stream->stream_id)->qry;
         if (qry) {
             ret = _output_dnssim_answers_request(qry->req, &dns_a);