daemon/quic: fix linting warnings

- add types to fields of struct nc_conn_ref_placeholder_t
- comment out testing DOQ error code

diff --git a/daemon/quic_common.h b/daemon/quic_common.h
index 17d0b26faabcfc35a82ccc821e6ee27ded356db8..1fdf4ac5a3cf0f41dcec3f079b166bbde58f7050 100644 (file)
--- a/daemon/quic_common.h
+++ b/daemon/quic_common.h
@@ -41,7 +41,7 @@ typedef enum {
             error code. */
        DOQ_UNSPECIFIED_ERROR = 0x5,
        /*! Alternative error code, can be used for tests. */
-       DOQ_ERROR_RESERVED = 0xd098ea5e
+       //DOQ_ERROR_RESERVED = 0xd098ea5e
 } quic_doq_error_t;
 
 // Macros from knot quic impl

diff --git a/daemon/quic_conn.c b/daemon/quic_conn.c
index 6709571a37cea99b579b8f30079d2c294d988485..d161575314b4d0040163113e5b757a2d5ecc1d6f 100644 (file)
--- a/daemon/quic_conn.c
+++ b/daemon/quic_conn.c
@@ -315,7 +315,7 @@ static int conn_new_handler(ngtcp2_conn **pconn, const ngtcp2_path *path,
        if (limit != 0) {
                settings.max_tx_udp_payload_size = limit;
        }
-       
+
        settings.handshake_timeout = QUIC_HS_IDLE_TIMEOUT;
        settings.no_pmtud = true;
 
@@ -360,8 +360,10 @@ static int conn_new_handler(ngtcp2_conn **pconn, const ngtcp2_path *path,
        }
 
        if (server) {
-               return ngtcp2_conn_server_new(pconn, scid, dcid, path, version,
-                               &callbacks, &settings, &params, NULL, conn);
+               const ngtcp2_cid *client_dcid = scid;
+               const ngtcp2_cid *client_scid = dcid;
+               return ngtcp2_conn_server_new(pconn, client_dcid, client_scid, path,
+                               version, &callbacks, &settings, &params, NULL, conn);
        } else {
                kr_log_warning(DOQ, "Client side is not implemented\n");
                return kr_error(EINVAL);
@@ -474,7 +476,7 @@ int kr_tls_server_session(struct pl_quic_conn_sess_data *conn)
        return ret;
 }
 
-static ngtcp2_conn *get_conn(ngtcp2_crypto_conn_ref *conn_ref)
+ngtcp2_conn *get_conn(ngtcp2_crypto_conn_ref *conn_ref)
 {
        return ((struct pl_quic_conn_sess_data *)conn_ref->user_data)->conn;
 }

diff --git a/daemon/quic_conn.h b/daemon/quic_conn.h
index 7b407fd3b6c6b272b53884b183ce5f2ec893fb2a..b86f392bed2eb1baff93e26be0ce9ba25e35c0a7 100644 (file)
--- a/daemon/quic_conn.h
+++ b/daemon/quic_conn.h
@@ -39,8 +39,8 @@ typedef enum {
        ((conn)->state < QUIC_STATE_DRAINING)
 
 typedef struct {
-       void *get_conn;
-       void *user_data;
+       struct ngtcp2_conn *(*get_conn)(ngtcp2_crypto_conn_ref *conn_ref);
+       struct pl_quic_conn_sess_data *user_data;
 } nc_conn_ref_placeholder_t;
 
 struct kr_quic_stream_list {