Merge pull request #1851 from private-octopus/multipath-draft-13

Fix TP value for draft 13.

Author: huitema

picohttp/quicperf.c

@@ -1244,7 +1244,7 @@ size_t quicperf_prepare_time_stamp(quicperf_stream_ctx_t* stream_ctx, uint8_t *
 {
     size_t byte_index = 0;
     if (stream_ctx->frame_bytes_sent < 8) {
-        uint8_t time_stamp[8];
+        uint8_t time_stamp[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
         if (picoquic_frames_uint64_encode(buffer, buffer + 8, stream_ctx->frame_start_stamp) != NULL) {
             while (stream_ctx->frame_bytes_sent < 8 && byte_index < available) {
                 buffer[byte_index] = time_stamp[stream_ctx->frame_bytes_sent];

picoquic/picoquic_internal.h

@@ -588,7 +588,7 @@ typedef uint64_t picoquic_tp_enum;
 #define picoquic_tp_grease_quic_bit 0x2ab2
 #define picoquic_tp_version_negotiation 0x11
 #define picoquic_tp_enable_bdp_frame 0xebd9 /* per draft-kuhn-quic-0rtt-bdp-09 */
-#define picoquic_tp_initial_max_path_id 0x0f739bbc1b666d0cull /* per draft quic multipath 12 */ 
+#define picoquic_tp_initial_max_path_id 0x0f739bbc1b666d0dull /* per draft quic multipath 13 */ 
 #define picoquic_tp_address_discovery 0x9f81a176 /* per draft-seemann-quic-address-discovery */
 
 /* Callback for converting binary log to quic log at the end of a connection. 

picoquictest/log_tp_test_ref.txt

@@ -56,7 +56,7 @@
 0102030405060708:         Extension type: 1 (idle_timeout), length 1, 1e
 0102030405060708:         Extension type: 3 (max_packet_size), length 2, 45c8
 0102030405060708:         Extension type: 15 (hcid), length 8, 0203040506070809
-0102030405060708:         Extension type: 1113404765106498828 (initial_max_path_id), length 1, 04
+0102030405060708:         Extension type: 1113404765106498829 (initial_max_path_id), length 1, 04
 
 0102030405060708:     Extension list (36 bytes):
 0102030405060708:         Extension type: 1 (idle_timeout), length 2, 400a

picoquictest/tls_api_test.c

@@ -8254,7 +8254,7 @@ int padding_test_one(uint32_t padding_multiple, uint32_t padding_min_size)
 
             while (ret == 0 && nb_trials < 256 && nb_inactive < 256 && TEST_CLIENT_READY && TEST_SERVER_READY) {
                 int was_active = 0;
-                int ack_is_queued = 0;
+
                 nb_trials++;
                 if ((picoquic_is_cnx_backlog_empty(test_ctx->cnx_client) && picoquic_is_cnx_backlog_empty(test_ctx->cnx_server) &&
                     test_ctx->c_to_s_link->first_packet == NULL && test_ctx->s_to_c_link->first_packet == NULL)) {
@@ -8271,7 +8271,6 @@ int padding_test_one(uint32_t padding_multiple, uint32_t padding_min_size)
 
                 if (ret == 0 && is_queued && test_ctx->c_to_s_link->first_packet != NULL) {
                     size_t length = test_ctx->c_to_s_link->first_packet->length;
-                    uint8_t* bytes = test_ctx->c_to_s_link->first_packet->bytes;
                     size_t pn_offset = 1 + test_ctx->cnx_client->path[0]->p_remote_cnxid->cnx_id.id_len;
                     size_t pn_length = padding_test_predict_pn_length(&test_ctx->cnx_client->pkt_ctx[picoquic_packet_context_application]);
                     size_t raw_length = pn_offset + pn_length + test_sizes[i];