record if ESNI was used

h2o · Jul 6, 2018 · b11d7b8 · b11d7b8
1 parent 9a80f72
commit b11d7b8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/include/picotls.h b/include/picotls.h
@@ -590,6 +590,10 @@ typedef struct st_ptls_handshake_properties_t {
              * if retry should be stateless (cookie.key MUST be set when this option is used)
              */
             unsigned retry_uses_cookie : 1;
+            /**
+             * if esni was used
+             */
+            unsigned esni : 1;
         } server;
     };
     /**

diff --git a/lib/picotls.c b/lib/picotls.c
@@ -3188,12 +3188,15 @@ static int server_handle_hello(ptls_t *tls, struct st_ptls_message_emitter_t *em
         memcpy(tls->client_random, ch.random_bytes, sizeof(tls->client_random));
         ptls_iovec_t server_name = {NULL};
         int should_free_server_name = 0;
+        properties->server.esni = 0;
         if (ch.server_name.base != NULL) {
             server_name = ch.server_name;
         } else if (ch.esni.cipher != NULL && tls->ctx->esni != NULL) {
             if ((ret = client_hello_decode_esni(tls->ctx, &key_share.algorithm, &key_share.peer_key, &server_name, &ch)) != 0)
                 goto Exit;
             should_free_server_name = 1;
+            if (properties != NULL)
+                properties->server.esni = 1;
         }
         if (tls->ctx->on_client_hello != NULL) {
             ret = tls->ctx->on_client_hello->cb(tls->ctx->on_client_hello, tls, server_name, ch.alpn.list, ch.alpn.count,