QUIC: Reorder line code for QUIC Transport Parameter (draft -17)

Bug: 13881
Change-Id: I3f721441a793740aaff7eae5a2bc10ec66e8e220
Reviewed-on: https://code.wireshark.org/review/31553
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

2 files changed, 129 insertions, 130 deletions

diff --git a/epan/dissectors/packet-tls-utils.c b/epan/dissectors/packet-tls-utils.c
index 9cd77e1684..ccccb57864 100644
--- a/epan/dissectors/packet-tls-utils.c
+++ b/epan/dissectors/packet-tls-utils.c
@@ -1359,20 +1359,20 @@ const value_string compress_certificate_algorithm_vals[] = {
 
 
 const value_string quic_transport_parameter_id[] = {
-    { SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_DATA_BIDI_LOCAL, "initial_max_stream_data_bidi_local" },
-    { SSL_HND_QUIC_TP_INITIAL_MAX_DATA, "initial_max_data" },
-    { SSL_HND_QUIC_TP_INITIAL_MAX_STREAMS_BIDI, "initial_max_streams_bidi" },
+    { SSL_HND_QUIC_TP_ORIGINAL_CONNECTION_ID, "original_connection_id" },
     { SSL_HND_QUIC_TP_IDLE_TIMEOUT, "idle_timeout" },
-    { SSL_HND_QUIC_TP_PREFERRED_ADDRESS, "preferred_address" },
-    { SSL_HND_QUIC_TP_MAX_PACKET_SIZE, "max_packet_size" },
     { SSL_HND_QUIC_TP_STATELESS_RESET_TOKEN, "stateless_reset_token" },
-    { SSL_HND_QUIC_TP_ACK_DELAY_EXPONENT, "ack_delay_exponent" },
-    { SSL_HND_QUIC_TP_INITIAL_MAX_STREAMS_UNI, "initial_max_streams_uni" },
-    { SSL_HND_QUIC_TP_DISABLE_MIGRATION, "disable_migration" },
+    { SSL_HND_QUIC_TP_MAX_PACKET_SIZE, "max_packet_size" },
+    { SSL_HND_QUIC_TP_INITIAL_MAX_DATA, "initial_max_data" },
+    { SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_DATA_BIDI_LOCAL, "initial_max_stream_data_bidi_local" },
     { SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_DATA_BIDI_REMOTE, "initial_max_stream_data_bidi_remote" },
     { SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_DATA_UNI, "initial_max_stream_data_uni" },
+    { SSL_HND_QUIC_TP_INITIAL_MAX_STREAMS_UNI, "initial_max_streams_uni" },
+    { SSL_HND_QUIC_TP_INITIAL_MAX_STREAMS_BIDI, "initial_max_streams_bidi" },
+    { SSL_HND_QUIC_TP_ACK_DELAY_EXPONENT, "ack_delay_exponent" },
     { SSL_HND_QUIC_TP_MAX_ACK_DELAY, "max_ack_delay" },
-    { SSL_HND_QUIC_TP_ORIGINAL_CONNECTION_ID, "original_connection_id" },
+    { SSL_HND_QUIC_TP_DISABLE_MIGRATION, "disable_migration" },
+    { SSL_HND_QUIC_TP_PREFERRED_ADDRESS, "preferred_address" },
     { 0, NULL }
 };
 
@@ -6705,10 +6705,27 @@ ssl_dissect_hnd_hello_ext_quic_transport_parameters(ssl_common_dissect_t *hf, tv
                             tvb, offset, parameter_length, ENC_NA);
 
         switch (parameter_type) {
-            case SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_DATA_BIDI_LOCAL:
-                proto_tree_add_item_ret_varint(parameter_tree, hf->hf.hs_ext_quictp_parameter_initial_max_stream_data_bidi_local,
+            case SSL_HND_QUIC_TP_ORIGINAL_CONNECTION_ID:
+                proto_tree_add_item(parameter_tree, hf->hf.hs_ext_quictp_parameter_ocid,
+                                    tvb, offset, parameter_length, ENC_NA);
+                offset += parameter_length;
+            break;
+            case SSL_HND_QUIC_TP_IDLE_TIMEOUT:
+                proto_tree_add_item_ret_varint(parameter_tree, hf->hf.hs_ext_quictp_parameter_idle_timeout,
+                                               tvb, offset, -1, ENC_VARINT_QUIC, &value, &len);
+                proto_item_append_text(parameter_tree, " %" G_GINT64_MODIFIER "u secs", value);
+                offset += len;
+            break;
+            case SSL_HND_QUIC_TP_STATELESS_RESET_TOKEN:
+                proto_tree_add_item(parameter_tree, hf->hf.hs_ext_quictp_parameter_stateless_reset_token,
+                                    tvb, offset, 16, ENC_BIG_ENDIAN);
+                offset += 16;
+            break;
+            case SSL_HND_QUIC_TP_MAX_PACKET_SIZE:
+                proto_tree_add_item_ret_varint(parameter_tree, hf->hf.hs_ext_quictp_parameter_max_packet_size,
                                                tvb, offset, -1, ENC_VARINT_QUIC, &value, &len);
                 proto_item_append_text(parameter_tree, " %" G_GINT64_MODIFIER "u", value);
+                /*TODO display expert info about invalid value (< 1252 or >65527) ? */
                 offset += len;
             break;
             case SSL_HND_QUIC_TP_INITIAL_MAX_DATA:
@@ -6717,18 +6734,51 @@ ssl_dissect_hnd_hello_ext_quic_transport_parameters(ssl_common_dissect_t *hf, tv
                 proto_item_append_text(parameter_tree, " %" G_GINT64_MODIFIER "u", value);
                 offset += len;
             break;
+            case SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_DATA_BIDI_LOCAL:
+                proto_tree_add_item_ret_varint(parameter_tree, hf->hf.hs_ext_quictp_parameter_initial_max_stream_data_bidi_local,
+                                               tvb, offset, -1, ENC_VARINT_QUIC, &value, &len);
+                proto_item_append_text(parameter_tree, " %" G_GINT64_MODIFIER "u", value);
+                offset += len;
+            break;
+            case SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_DATA_BIDI_REMOTE:
+                proto_tree_add_item_ret_varint(parameter_tree, hf->hf.hs_ext_quictp_parameter_initial_max_stream_data_bidi_remote,
+                                               tvb, offset, -1, ENC_VARINT_QUIC, &value, &len);
+                proto_item_append_text(parameter_tree, " %" G_GINT64_MODIFIER "u", value);
+                offset += len;
+            break;
+            case SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_DATA_UNI:
+                proto_tree_add_item_ret_varint(parameter_tree, hf->hf.hs_ext_quictp_parameter_initial_max_stream_data_uni,
+                                               tvb, offset, -1, ENC_VARINT_QUIC, &value, &len);
+                proto_item_append_text(parameter_tree, " %" G_GINT64_MODIFIER "u", value);
+                offset += len;
+            break;
+            case SSL_HND_QUIC_TP_INITIAL_MAX_STREAMS_UNI:
+                proto_tree_add_item_ret_varint(parameter_tree, hf->hf.hs_ext_quictp_parameter_initial_max_streams_uni,
+                                               tvb, offset, -1, ENC_VARINT_QUIC, &value, &len);
+                proto_item_append_text(parameter_tree, " %" G_GINT64_MODIFIER "u", value);
+                offset += len;
+            break;
             case SSL_HND_QUIC_TP_INITIAL_MAX_STREAMS_BIDI:
                 proto_tree_add_item_ret_varint(parameter_tree, hf->hf.hs_ext_quictp_parameter_initial_max_streams_bidi,
                                                tvb, offset, -1, ENC_VARINT_QUIC, &value, &len);
                 proto_item_append_text(parameter_tree, " %" G_GINT64_MODIFIER "u", value);
                 offset += len;
             break;
-            case SSL_HND_QUIC_TP_IDLE_TIMEOUT:
-                proto_tree_add_item_ret_varint(parameter_tree, hf->hf.hs_ext_quictp_parameter_idle_timeout,
+            case SSL_HND_QUIC_TP_ACK_DELAY_EXPONENT:
+                proto_tree_add_item_ret_varint(parameter_tree, hf->hf.hs_ext_quictp_parameter_ack_delay_exponent,
+                                               tvb, offset, -1, ENC_VARINT_QUIC, NULL, &len);
+                /*TODO display multiplier (x8) and expert info about invalid value (> 20) ? */
+                offset += len;
+            break;
+            case SSL_HND_QUIC_TP_MAX_ACK_DELAY:
+                proto_tree_add_item_ret_varint(parameter_tree, hf->hf.hs_ext_quictp_parameter_max_ack_delay,
                                                tvb, offset, -1, ENC_VARINT_QUIC, &value, &len);
-                proto_item_append_text(parameter_tree, " %" G_GINT64_MODIFIER "u secs", value);
+                proto_item_append_text(parameter_tree, " %" G_GINT64_MODIFIER "u", value);
                 offset += len;
             break;
+            case SSL_HND_QUIC_TP_DISABLE_MIGRATION:
+                /* No Payload */
+            break;
             case SSL_HND_QUIC_TP_PREFERRED_ADDRESS: {
                 guint32 ipversion, ipaddress_length, connectionid_length;
                 proto_tree_add_item_ret_uint(parameter_tree, hf->hf.hs_ext_quictp_parameter_pa_ipversion,
@@ -6774,57 +6824,6 @@ ssl_dissect_hnd_hello_ext_quic_transport_parameters(ssl_common_dissect_t *hf, tv
                 offset += 16;
             }
             break;
-            case SSL_HND_QUIC_TP_MAX_PACKET_SIZE:
-                proto_tree_add_item_ret_varint(parameter_tree, hf->hf.hs_ext_quictp_parameter_max_packet_size,
-                                               tvb, offset, -1, ENC_VARINT_QUIC, &value, &len);
-                proto_item_append_text(parameter_tree, " %" G_GINT64_MODIFIER "u", value);
-                /*TODO display expert info about invalid value (< 1252 or >65527) ? */
-                offset += len;
-            break;
-            case SSL_HND_QUIC_TP_STATELESS_RESET_TOKEN:
-                proto_tree_add_item(parameter_tree, hf->hf.hs_ext_quictp_parameter_stateless_reset_token,
-                                    tvb, offset, 16, ENC_BIG_ENDIAN);
-                offset += 16;
-            break;
-            case SSL_HND_QUIC_TP_ACK_DELAY_EXPONENT:
-
-                proto_tree_add_item_ret_varint(parameter_tree, hf->hf.hs_ext_quictp_parameter_ack_delay_exponent,
-                                               tvb, offset, -1, ENC_VARINT_QUIC, NULL, &len);
-                /*TODO display multiplier (x8) and expert info about invalid value (> 20) ? */
-                offset += len;
-            break;
-            case SSL_HND_QUIC_TP_INITIAL_MAX_STREAMS_UNI:
-                proto_tree_add_item_ret_varint(parameter_tree, hf->hf.hs_ext_quictp_parameter_initial_max_streams_uni,
-                                               tvb, offset, -1, ENC_VARINT_QUIC, &value, &len);
-                proto_item_append_text(parameter_tree, " %" G_GINT64_MODIFIER "u", value);
-                offset += len;
-            break;
-            case SSL_HND_QUIC_TP_DISABLE_MIGRATION:
-                /* No Payload */
-            break;
-            case SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_DATA_BIDI_REMOTE:
-                proto_tree_add_item_ret_varint(parameter_tree, hf->hf.hs_ext_quictp_parameter_initial_max_stream_data_bidi_remote,
-                                               tvb, offset, -1, ENC_VARINT_QUIC, &value, &len);
-                proto_item_append_text(parameter_tree, " %" G_GINT64_MODIFIER "u", value);
-                offset += len;
-            break;
-            case SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_DATA_UNI:
-                proto_tree_add_item_ret_varint(parameter_tree, hf->hf.hs_ext_quictp_parameter_initial_max_stream_data_uni,
-                                               tvb, offset, -1, ENC_VARINT_QUIC, &value, &len);
-                proto_item_append_text(parameter_tree, " %" G_GINT64_MODIFIER "u", value);
-                offset += len;
-            break;
-            case SSL_HND_QUIC_TP_MAX_ACK_DELAY:
-                proto_tree_add_item_ret_varint(parameter_tree, hf->hf.hs_ext_quictp_parameter_max_ack_delay,
-                                               tvb, offset, -1, ENC_VARINT_QUIC, &value, &len);
-                proto_item_append_text(parameter_tree, " %" G_GINT64_MODIFIER "u", value);
-                offset += len;
-            break;
-            case SSL_HND_QUIC_TP_ORIGINAL_CONNECTION_ID:
-                proto_tree_add_item(parameter_tree, hf->hf.hs_ext_quictp_parameter_ocid,
-                                    tvb, offset, parameter_length, ENC_NA);
-                offset += parameter_length;
-            break;
             default:
                 offset += parameter_length;
                 /*TODO display expert info about unknown ? */
diff --git a/epan/dissectors/packet-tls-utils.h b/epan/dissectors/packet-tls-utils.h
index 29eb1728b4..4a77099c77 100644
--- a/epan/dissectors/packet-tls-utils.h
+++ b/epan/dissectors/packet-tls-utils.h
@@ -150,20 +150,20 @@ typedef enum {
 #define SSL_HND_CERT_STATUS_TYPE_OCSP_MULTI  2
 #define SSL_HND_CERT_TYPE_RAW_PUBLIC_KEY     2
 
-#define SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_DATA_BIDI_LOCAL  5
-#define SSL_HND_QUIC_TP_INITIAL_MAX_DATA                    4
-#define SSL_HND_QUIC_TP_INITIAL_MAX_STREAMS_BIDI            8
+#define SSL_HND_QUIC_TP_ORIGINAL_CONNECTION_ID              0
 #define SSL_HND_QUIC_TP_IDLE_TIMEOUT                        1
-#define SSL_HND_QUIC_TP_PREFERRED_ADDRESS                   13
-#define SSL_HND_QUIC_TP_MAX_PACKET_SIZE                     3
 #define SSL_HND_QUIC_TP_STATELESS_RESET_TOKEN               2
-#define SSL_HND_QUIC_TP_ACK_DELAY_EXPONENT                  10
-#define SSL_HND_QUIC_TP_INITIAL_MAX_STREAMS_UNI             9
-#define SSL_HND_QUIC_TP_DISABLE_MIGRATION                   12
+#define SSL_HND_QUIC_TP_MAX_PACKET_SIZE                     3
+#define SSL_HND_QUIC_TP_INITIAL_MAX_DATA                    4
+#define SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_DATA_BIDI_LOCAL  5
 #define SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_DATA_BIDI_REMOTE 6
 #define SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_DATA_UNI         7
+#define SSL_HND_QUIC_TP_INITIAL_MAX_STREAMS_BIDI            8
+#define SSL_HND_QUIC_TP_INITIAL_MAX_STREAMS_UNI             9
+#define SSL_HND_QUIC_TP_ACK_DELAY_EXPONENT                  10
 #define SSL_HND_QUIC_TP_MAX_ACK_DELAY                       11
-#define SSL_HND_QUIC_TP_ORIGINAL_CONNECTION_ID              0
+#define SSL_HND_QUIC_TP_DISABLE_MIGRATION                   12
+#define SSL_HND_QUIC_TP_PREFERRED_ADDRESS                   13
 
 /*
  * Lookup tables
@@ -860,10 +860,18 @@ typedef struct ssl_common_dissect {
         gint hs_ext_quictp_parameter_type;
         gint hs_ext_quictp_parameter_len;
         gint hs_ext_quictp_parameter_value;
-        gint hs_ext_quictp_parameter_initial_max_stream_data_bidi_local;
+        gint hs_ext_quictp_parameter_ocid;
+        gint hs_ext_quictp_parameter_idle_timeout;
+        gint hs_ext_quictp_parameter_stateless_reset_token;
         gint hs_ext_quictp_parameter_initial_max_data;
+        gint hs_ext_quictp_parameter_initial_max_stream_data_bidi_local;
+        gint hs_ext_quictp_parameter_initial_max_stream_data_bidi_remote;
+        gint hs_ext_quictp_parameter_initial_max_stream_data_uni;
         gint hs_ext_quictp_parameter_initial_max_streams_bidi;
-        gint hs_ext_quictp_parameter_idle_timeout;
+        gint hs_ext_quictp_parameter_initial_max_streams_uni;
+        gint hs_ext_quictp_parameter_ack_delay_exponent;
+        gint hs_ext_quictp_parameter_max_ack_delay;
+        gint hs_ext_quictp_parameter_max_packet_size;
         gint hs_ext_quictp_parameter_pa_ipversion;
         gint hs_ext_quictp_parameter_pa_ipaddress_length;
         gint hs_ext_quictp_parameter_pa_ipaddress_ipv4;
@@ -872,14 +880,6 @@ typedef struct ssl_common_dissect {
         gint hs_ext_quictp_parameter_pa_connectionid_length;
         gint hs_ext_quictp_parameter_pa_connectionid;
         gint hs_ext_quictp_parameter_pa_statelessresettoken;
-        gint hs_ext_quictp_parameter_max_packet_size;
-        gint hs_ext_quictp_parameter_stateless_reset_token;
-        gint hs_ext_quictp_parameter_ack_delay_exponent;
-        gint hs_ext_quictp_parameter_initial_max_streams_uni;
-        gint hs_ext_quictp_parameter_initial_max_stream_data_bidi_remote;
-        gint hs_ext_quictp_parameter_initial_max_stream_data_uni;
-        gint hs_ext_quictp_parameter_max_ack_delay;
-        gint hs_ext_quictp_parameter_ocid;
 
         gint esni_suite;
         gint esni_record_digest_length;
@@ -1905,25 +1905,65 @@ ssl_common_dissect_t name = {   \
         FT_BYTES, BASE_NONE, NULL, 0x00,                                \
         NULL, HFILL }                                                   \
     },                                                                  \
-    { & name .hf.hs_ext_quictp_parameter_initial_max_stream_data_bidi_local, \
-      { "initial_max_stream_data_bidi_local", prefix ".quic.parameter.initial_max_stream_data_bidi_local", \
+    { & name .hf.hs_ext_quictp_parameter_ocid,                          \
+      { "original_connection_id", prefix ".quic.parameter.ocid",        \
+        FT_BYTES, BASE_NONE, NULL, 0x00,                                \
+        "The value of the Destination Connection ID field from the first Initial packet sent by the client", HFILL } \
+    },                                                                  \
+    { & name .hf.hs_ext_quictp_parameter_idle_timeout,                  \
+      { "idle_timeout", prefix ".quic.parameter.idle_timeout",          \
         FT_UINT64, BASE_DEC, NULL, 0x00,                                \
-        "Initial stream maximum data for bidirectional, locally-initiated streams", HFILL }                                                                 \
+        "In seconds", HFILL }                                           \
+    },                                                                  \
+    { & name .hf.hs_ext_quictp_parameter_stateless_reset_token,         \
+      { "stateless_reset_token", prefix ".quic.parameter.stateless_reset_token",    \
+        FT_BYTES, BASE_NONE, NULL, 0x00,                                \
+        "Used in verifying a stateless reset", HFILL }                  \
+    },                                                                  \
+    { & name .hf.hs_ext_quictp_parameter_max_packet_size,               \
+      { "max_packet_size", prefix ".quic.parameter.max_packet_size",    \
+        FT_UINT64, BASE_DEC, NULL, 0x00,                                \
+        "Indicates that packets larger than this limit will be dropped", HFILL }    \
     },                                                                  \
     { & name .hf.hs_ext_quictp_parameter_initial_max_data,              \
       { "initial_max_data", prefix ".quic.parameter.initial_max_data",  \
         FT_UINT64, BASE_DEC, NULL, 0x00,                                \
         "Contains the initial value for the maximum amount of data that can be sent on the connection", HFILL }                                                                 \
     },                                                                  \
+    { & name .hf.hs_ext_quictp_parameter_initial_max_stream_data_bidi_local, \
+      { "initial_max_stream_data_bidi_local", prefix ".quic.parameter.initial_max_stream_data_bidi_local", \
+        FT_UINT64, BASE_DEC, NULL, 0x00,                                \
+        "Initial stream maximum data for bidirectional, locally-initiated streams", HFILL }                                                                 \
+    },                                                                  \
+    { & name .hf.hs_ext_quictp_parameter_initial_max_stream_data_bidi_remote, \
+      { "initial_max_stream_data_bidi_remote", prefix ".quic.parameter.initial_max_stream_data_bidi_remote", \
+        FT_UINT64, BASE_DEC, NULL, 0x00,                                \
+        "Initial stream maximum data for bidirectional, peer-initiated streams", HFILL }                                                                 \
+    },                                                                  \
+    { & name .hf.hs_ext_quictp_parameter_initial_max_stream_data_uni,   \
+      { "initial_max_stream_data_uni", prefix ".quic.parameter.initial_max_stream_data_uni", \
+        FT_UINT64, BASE_DEC, NULL, 0x00,                                \
+        "Initial stream maximum data for unidirectional streams parameter", HFILL } \
+    },                                                                  \
     { & name .hf.hs_ext_quictp_parameter_initial_max_streams_bidi,      \
       { "initial_max_streams_bidi", prefix ".quic.parameter.initial_max_streams_bidi",  \
         FT_UINT64, BASE_DEC, NULL, 0x00,                                \
         "Initial maximum number of application-owned bidirectional streams", HFILL } \
     },                                                                  \
-    { & name .hf.hs_ext_quictp_parameter_idle_timeout,                  \
-      { "idle_timeout", prefix ".quic.parameter.idle_timeout",          \
+    { & name .hf.hs_ext_quictp_parameter_initial_max_streams_uni,       \
+      { "initial_max_streams_uni", prefix ".quic.parameter.initial_max_streams_uni",    \
         FT_UINT64, BASE_DEC, NULL, 0x00,                                \
-        "In seconds", HFILL }                                           \
+        "Initial maximum number of application-owned unidirectional streams", HFILL }   \
+    },                                                                  \
+    { & name .hf.hs_ext_quictp_parameter_ack_delay_exponent,            \
+      { "ack_delay_exponent", prefix ".quic.parameter.ack_delay_exponent",  \
+        FT_UINT64, BASE_DEC, NULL, 0x00,                                \
+        "Indicating an exponent used to decode the ACK Delay field in the ACK frame,", HFILL }  \
+    },                                                                  \
+    { & name .hf.hs_ext_quictp_parameter_max_ack_delay,                 \
+      { "max_ack_delay", prefix ".quic.parameter.max_ack_delay",        \
+        FT_UINT64, BASE_DEC, NULL, 0x00,                                \
+        "Indicating the maximum amount of time in milliseconds by which it will delay sending of acknowledgments", HFILL } \
     },                                                                  \
     { & name .hf.hs_ext_quictp_parameter_pa_ipversion,                  \
       { "ipVersion", prefix ".quic.parameter.preferred_address.ipversion",  \
@@ -1965,46 +2005,6 @@ ssl_common_dissect_t name = {   \
         FT_BYTES, BASE_NONE, NULL, 0x00,                                \
         NULL, HFILL }                                                   \
     },                                                                  \
-    { & name .hf.hs_ext_quictp_parameter_max_packet_size,               \
-      { "max_packet_size", prefix ".quic.parameter.max_packet_size",    \
-        FT_UINT64, BASE_DEC, NULL, 0x00,                                \
-        "Indicates that packets larger than this limit will be dropped", HFILL }    \
-    },                                                                  \
-    { & name .hf.hs_ext_quictp_parameter_stateless_reset_token,         \
-      { "stateless_reset_token", prefix ".quic.parameter.stateless_reset_token",    \
-        FT_BYTES, BASE_NONE, NULL, 0x00,                                \
-        "Used in verifying a stateless reset", HFILL }                  \
-    },                                                                  \
-    { & name .hf.hs_ext_quictp_parameter_ack_delay_exponent,            \
-      { "ack_delay_exponent", prefix ".quic.parameter.ack_delay_exponent",  \
-        FT_UINT64, BASE_DEC, NULL, 0x00,                                \
-        "Indicating an exponent used to decode the ACK Delay field in the ACK frame,", HFILL }  \
-    },                                                                  \
-    { & name .hf.hs_ext_quictp_parameter_initial_max_streams_uni,       \
-      { "initial_max_streams_uni", prefix ".quic.parameter.initial_max_streams_uni",    \
-        FT_UINT64, BASE_DEC, NULL, 0x00,                                \
-        "Initial maximum number of application-owned unidirectional streams", HFILL }   \
-    },                                                                  \
-    { & name .hf.hs_ext_quictp_parameter_initial_max_stream_data_bidi_remote, \
-      { "initial_max_stream_data_bidi_remote", prefix ".quic.parameter.initial_max_stream_data_bidi_remote", \
-        FT_UINT64, BASE_DEC, NULL, 0x00,                                \
-        "Initial stream maximum data for bidirectional, peer-initiated streams", HFILL }                                                                 \
-    },                                                                  \
-    { & name .hf.hs_ext_quictp_parameter_initial_max_stream_data_uni,   \
-      { "initial_max_stream_data_uni", prefix ".quic.parameter.initial_max_stream_data_uni", \
-        FT_UINT64, BASE_DEC, NULL, 0x00,                                \
-        "Initial stream maximum data for unidirectional streams parameter", HFILL } \
-    },                                                                  \
-    { & name .hf.hs_ext_quictp_parameter_max_ack_delay,                 \
-      { "max_ack_delay", prefix ".quic.parameter.max_ack_delay",        \
-        FT_UINT64, BASE_DEC, NULL, 0x00,                                \
-        "Indicating the maximum amount of time in milliseconds by which it will delay sending of acknowledgments", HFILL } \
-    },                                                                  \
-    { & name .hf.hs_ext_quictp_parameter_ocid,                          \
-      { "original_connection_id", prefix ".quic.parameter.ocid",        \
-        FT_BYTES, BASE_NONE, NULL, 0x00,                                \
-        "The value of the Destination Connection ID field from the first Initial packet sent by the client", HFILL } \
-    },                                                                  \
     { & name .hf.esni_suite,                                            \
       { "Cipher Suite", prefix ".esni.suite",                           \
         FT_UINT16, BASE_HEX|BASE_EXT_STRING, &ssl_31_ciphersuite_ext, 0x0, \