From 80cdaaad24700b30b01825b5f59b0539c56973b8 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sun, 12 Feb 2023 21:44:33 +0100
Subject: [PATCH] Better nail down where QUIC is possibly being used

---
 src/main.rs | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index c32c449..45a1ca7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -196,23 +196,26 @@ async fn handle_client_query(
             Ok(x) => x,
             Err(_) => {
                 let packet = encrypted_packet;
-                if let Some(synth_packet) = serve_certificates(
+                match serve_certificates(
                     &packet,
                     &globals.provider_name,
                     &dnscrypt_encryption_params_set,
-                )? {
-                    return encrypt_and_respond_to_query(
-                        globals,
-                        client_ctx,
-                        packet,
-                        synth_packet,
-                        original_packet_size,
-                        None,
-                        None,
-                    )
-                    .await;
-                }
-                bail!("Unencrypted query or QUIC protocol");
+                ) {
+                    Ok(Some(synth_packet)) => {
+                        return encrypt_and_respond_to_query(
+                            globals,
+                            client_ctx,
+                            packet,
+                            synth_packet,
+                            original_packet_size,
+                            None,
+                            None,
+                        )
+                        .await
+                    }
+                    Ok(None) => return Ok(()),
+                    Err(_) => bail!("Unencrypted query or QUIC protocol"),
+                };
             }
         };
     ensure!(packet.len() >= DNS_HEADER_SIZE, "Short packet");