Align max path ID TP and path block CID

Author: huitema

loglib/qlog.c

@@ -833,8 +833,11 @@ void qlog_paths_blocked_frame(FILE* f, bytestream* s)
 void qlog_path_cid_blocked_frame(FILE* f, bytestream* s)
 {
     uint64_t path_id = 0;
+    uint64_t next_sequence_number = 0;
     byteread_vint(s, &path_id);
+    byteread_vint(s, &next_sequence_number);
     fprintf(f, ", \"path_id\": %"PRIu64, path_id);
+    fprintf(f, ", \"next_sequence_number\": %"PRIu64, next_sequence_number);
 }
 
 void qlog_reset_stream_frame(FILE* f, bytestream* s)

picoquic/frames.c

@@ -5871,18 +5871,37 @@ int picoquic_process_ack_of_paths_blocked_frame(picoquic_cnx_t* cnx, const uint8
 
 /* PATH CID BLOCKED frame */
 uint8_t* picoquic_format_path_cid_blocked_frame(
-    uint8_t* bytes, const uint8_t* bytes_max, uint64_t path_id, int* more_data)
+    uint8_t* bytes, const uint8_t* bytes_max, uint64_t path_id, uint64_t next_sequence_number, int* more_data)
 {
     /* This code assumes that the frame type is already skipped */
     uint8_t* bytes0 = bytes;
     if ((bytes = picoquic_frames_varint_encode(bytes, bytes_max, picoquic_frame_type_path_cid_blocked)) == NULL ||
-        (bytes = picoquic_frames_varint_encode(bytes, bytes_max, path_id)) == NULL) {
+        (bytes = picoquic_frames_varint_encode(bytes, bytes_max, path_id)) == NULL ||
+        (bytes = picoquic_frames_varint_encode(bytes, bytes_max, next_sequence_number)) == NULL) {
         bytes = bytes0;
         *more_data = 1;
     }
     return bytes;
 }
 
+uint64_t picoquic_path_cid_next_sequence_number(picoquic_path_t * path_x)
+{
+    picoquic_remote_cnxid_stash_t* stash = picoquic_find_or_create_remote_cnxid_stash(path_x->cnx, path_x->unique_path_id, 0);
+    uint64_t next_sequence_number = 0;
+
+    if (stash != NULL) {
+        picoquic_remote_cnxid_t* remote_cnxid = stash->cnxid_stash_first;
+
+        while (remote_cnxid != NULL) {
+            if (remote_cnxid->sequence >= next_sequence_number) {
+                next_sequence_number = remote_cnxid->sequence + 1;
+            }
+            remote_cnxid = remote_cnxid->next;
+        }
+    }
+    return next_sequence_number;
+}
+
 int picoquic_queue_path_cid_blocked_frame(
     picoquic_path_t * path_x)
 {
@@ -5891,8 +5910,10 @@ int picoquic_queue_path_cid_blocked_frame(
     uint8_t frame_buffer[256];
     int is_pure_ack = 0;
     int more_data = 0;
+    uint64_t next_sequence_number = picoquic_path_cid_next_sequence_number(path_x);
     uint8_t* bytes_next = picoquic_format_path_cid_blocked_frame(
-        frame_buffer, frame_buffer + sizeof(frame_buffer), path_x->unique_path_id, &more_data);
+        frame_buffer, frame_buffer + sizeof(frame_buffer), path_x->unique_path_id, 
+        next_sequence_number, &more_data);
     size_t consumed = bytes_next - frame_buffer;
     ret = picoquic_queue_misc_frame(path_x->cnx, frame_buffer, consumed, is_pure_ack,
         picoquic_packet_context_application);
@@ -5905,21 +5926,26 @@ int picoquic_queue_path_cid_blocked_frame(
 const uint8_t* picoquic_skip_path_cid_blocked_frame(const uint8_t* bytes, const uint8_t* bytes_max)
 {
     /* This code assumes that the frame type is already skipped */
-    bytes = picoquic_frames_varint_skip(bytes, bytes_max);
+    if ((bytes = picoquic_frames_varint_skip(bytes, bytes_max)) != NULL) {
+        bytes = picoquic_frames_varint_skip(bytes, bytes_max);
+    }
     return bytes;
 }
 
 const uint8_t* picoquic_parse_path_cid_blocked_frame(const uint8_t* bytes, const uint8_t* bytes_max,
-    uint64_t* max_path_id)
+    uint64_t* unique_path_id, uint64_t * next_sequence_number)
 {
-    bytes = picoquic_frames_varint_decode(bytes, bytes_max, max_path_id);
+    if ((bytes = picoquic_frames_varint_decode(bytes, bytes_max, unique_path_id)) != NULL) {
+        bytes = picoquic_frames_varint_decode(bytes, bytes_max, next_sequence_number);
+    }
     return bytes;
 }
 
 const uint8_t* picoquic_decode_path_cid_blocked_frame(const uint8_t* bytes, const uint8_t* bytes_max,
     picoquic_cnx_t* cnx)
 {
-    uint64_t path_id;
+    uint64_t unique_path_id = 0;
+    uint64_t next_sequence_number = 0;
 
     /* This code assumes that the frame type is already skipped */
 
@@ -5928,7 +5954,7 @@ const uint8_t* picoquic_decode_path_cid_blocked_frame(const uint8_t* bytes, cons
         picoquic_connection_error_ex(cnx, PICOQUIC_TRANSPORT_FRAME_FORMAT_ERROR,
             picoquic_frame_type_path_cid_blocked, "multipath extension not negotiated");
     }
-    else if ((bytes = picoquic_parse_path_cid_blocked_frame(bytes, bytes_max, &path_id)) == NULL) {
+    else if ((bytes = picoquic_parse_path_cid_blocked_frame(bytes, bytes_max, &unique_path_id, &next_sequence_number)) == NULL) {
         /* Bad frame encoding */
         picoquic_connection_error_ex(cnx, PICOQUIC_TRANSPORT_FRAME_FORMAT_ERROR,
             picoquic_frame_type_path_cid_blocked, "bad path blocked frame");
@@ -5941,10 +5967,11 @@ int picoquic_path_cid_blocked_frame_needs_repeat(picoquic_cnx_t* cnx, const uint
 {
     int ret = 0;
     uint64_t unique_path_id = 0;
+    uint64_t next_sequence_number = 0;
 
     *no_need_to_repeat = 0;
 
-    if ((bytes = picoquic_parse_path_cid_blocked_frame(bytes, bytes_max, &unique_path_id)) == NULL) {
+    if ((bytes = picoquic_parse_path_cid_blocked_frame(bytes, bytes_max, &unique_path_id, &next_sequence_number)) == NULL) {
         /* Malformed frame, do not retransmit */
         *no_need_to_repeat = 1;
     }
@@ -5960,6 +5987,15 @@ int picoquic_path_cid_blocked_frame_needs_repeat(picoquic_cnx_t* cnx, const uint
             /* the blocked frame was already acknowledged */
             *no_need_to_repeat = 1;
         }
+        else {
+            uint64_t current_next_number = picoquic_path_cid_next_sequence_number(cnx->path[path_index]);
+
+            if (current_next_number > next_sequence_number)
+            {
+                /* New CID is now available */
+                *no_need_to_repeat = 1;
+            }
+        }
     }
     return ret;
 }
@@ -5969,8 +6005,9 @@ int picoquic_process_ack_of_path_cid_blocked_frame(picoquic_cnx_t* cnx, const ui
 {
     int ret = 0;
     uint64_t unique_path_id = 0;
+    uint64_t next_sequence_number = 0;
 
-    const uint8_t* bytes_next = picoquic_parse_path_cid_blocked_frame(bytes, bytes + bytes_max, &unique_path_id);
+    const uint8_t* bytes_next = picoquic_parse_path_cid_blocked_frame(bytes, bytes + bytes_max, &unique_path_id, &next_sequence_number);
 
     if (bytes_next != NULL) {
         /* Find the path context for the path ID */
@@ -6864,7 +6901,7 @@ int picoquic_skip_frame(const uint8_t* bytes, size_t bytes_maxsize, size_t* cons
                     *pure_ack = 0;
                     break;
                 case picoquic_frame_type_path_cid_blocked:
-                    bytes = picoquic_skip_paths_blocked_frame(bytes, bytes_max);
+                    bytes = picoquic_skip_path_cid_blocked_frame(bytes, bytes_max);
                     *pure_ack = 0;
                     break;
                 case picoquic_frame_type_bdp:

picoquic/logger.c

@@ -1500,9 +1500,11 @@ size_t textlog_path_cid_blocked_frame(FILE* F, const uint8_t* bytes, size_t byte
     const uint8_t* bytes0 = bytes;
     uint64_t frame_id = 0;
     uint64_t path_id;
+    uint64_t next_sequence_number;
     size_t byte_index = 0;
     if ((bytes = picoquic_frames_varint_decode(bytes, bytes_end, &frame_id)) == NULL ||
-        (bytes = picoquic_frames_varint_decode(bytes, bytes_end, &path_id)) == NULL) {
+        (bytes = picoquic_frames_varint_decode(bytes, bytes_end, &path_id)) == NULL ||
+        (bytes = picoquic_frames_varint_decode(bytes, bytes_end, &next_sequence_number)) == NULL) {
         /* log format error */
         fprintf(F, "    Malformed %s frame: ", textlog_frame_names(frame_id));
         /* log format error */
@@ -1516,9 +1518,9 @@ size_t textlog_path_cid_blocked_frame(FILE* F, const uint8_t* bytes, size_t byte
         byte_index = bytes_max;
     }
     else {
-        fprintf(F, "    %s, path_id: %" PRIu64 "\n",
+        fprintf(F, "    %s, path_id: %" PRIu64 ", next_sequence_number: %" PRIu64 "\n",
             textlog_frame_names(picoquic_frame_type_path_cid_blocked),
-            path_id);
+            path_id, next_sequence_number);
         byte_index = (bytes - bytes0);
     }
     return byte_index;

picoquic/picoquic.h

@@ -137,6 +137,8 @@ extern "C" {
 
 #define PICOQUIC_TRANSPORT_APPLICATION_ABANDON (0x4150504C4142414E)
 #define PICOQUIC_TRANSPORT_RESOURCE_LIMIT_REACHED (0x5245534C494D4954)
+#define PICOQUIC_TRANSPORT_UNSTABLE_INTERFACE (0x554e5f494e5446)
+#define PICOQUIC_TRANSPORT_NO_CID_AVAILABLE (0x4e4f5f4349445f)
 
 #define PICOQUIC_MAX_PACKET_SIZE 1536
 #define PICOQUIC_INITIAL_MTU_IPV4 1252

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 12 */ 
 #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/binlog_ref.log

@@ -84,8 +84,8 @@
     "frame_type": "path_retire_connection_id", "path_id": 0, "sequence_number": 2}]}],
 [0, "transport", "packet_sent", { "packet_type": "1RTT", "header": { "packet_size": 5, "packet_number": 39, "dcid": "01020304" }, "frames": [{ 
     "frame_type": "paths_blocked", "max_path_id": 17}]}],
-[0, "transport", "packet_sent", { "packet_type": "1RTT", "header": { "packet_size": 5, "packet_number": 40, "dcid": "01020304" }, "frames": [{ 
-    "frame_type": "path_cid_blocked", "path_id": 7}]}],
+[0, "transport", "packet_sent", { "packet_type": "1RTT", "header": { "packet_size": 6, "packet_number": 40, "dcid": "01020304" }, "frames": [{ 
+    "frame_type": "path_cid_blocked", "path_id": 7, "next_sequence_number": 1}]}],
 [0, "transport", "packet_sent", { "packet_type": "1RTT", "header": { "packet_size": 12, "packet_number": 41, "dcid": "01020304" }, "frames": [{ 
     "frame_type": "bdp", "lifetime": 1, "bytes_in_flight": 2, "min_rtt": 3, "ip": "0a000001"}]}],
 [0, "transport", "packet_sent", { "packet_type": "1RTT", "header": { "packet_size": 11, "packet_number": 42, "dcid": "01020304" }, "frames": [{ 

picoquictest/binlog_ref.qlog

@@ -40,7 +40,7 @@
     path_retire_connection_id[1, 7]: 0x0102030405060708, a1a2a3a4a5a6a7a8a9aaabacadaeafb0
     path_retire_connection_id[0, 2]
     paths_blocked, max_path_id: 17
-    path_cid_blocked, path_id: 7
+    path_cid_blocked, path_id: 7, next_sequence_number: 1
     bdp_frame, lifetime: 1, bytes_in_flight: 2, min_rtt: 3, ip: 0a000001
     observed_address_v4, sequence: 1, addr: 1.2.3.4, port: 4660
     observed_address_v6, sequence: 2, addr: 102:304:506:708:90a:b0c:d0e:f00, port: 17767

picoquictest/log_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/log_tp_test_ref.txt

@@ -329,6 +329,7 @@ static uint8_t test_frame_type_path_cid_blocked[] = {
     (uint8_t)(0x80 | (picoquic_frame_type_path_cid_blocked >> 24)), (uint8_t)(picoquic_frame_type_path_cid_blocked >> 16),
     (uint8_t)(picoquic_frame_type_path_cid_blocked >> 8), (uint8_t)(picoquic_frame_type_path_cid_blocked & 0xFF),
     0x07, /* path id = 7 */
+    0x01 /* next sequence number = 1 */
 };
 
 static uint8_t test_frame_observed_address_v4[] = {
@@ -1560,7 +1561,7 @@ uint8_t* picoquic_format_path_available_or_standby_frame(
 uint8_t* picoquic_format_paths_blocked_frame(
     uint8_t* bytes, const uint8_t* bytes_max, uint64_t max_path_id, int* more_data);
 uint8_t* picoquic_format_path_cid_blocked_frame(
-    uint8_t* bytes, const uint8_t* bytes_max, uint64_t max_path_id, int* more_data);
+    uint8_t* bytes, const uint8_t* bytes_max, uint64_t max_path_id, uint64_t next_sequence_number, int* more_data);
 
 int frames_format_test()
 {
@@ -1632,7 +1633,7 @@ int frames_format_test()
         FRAME_FORMAT_TEST(picoquic_format_path_available_or_standby_frame, bytes, bytes_max, picoquic_frame_type_path_available, 1, 17, &more_data);
         FRAME_FORMAT_TEST(picoquic_format_max_path_id_frame, bytes, bytes_max, 123, &more_data);
         FRAME_FORMAT_TEST(picoquic_format_paths_blocked_frame, bytes, bytes_max, 123, &more_data);
-        FRAME_FORMAT_TEST(picoquic_format_path_cid_blocked_frame, bytes, bytes_max, 123, &more_data);
+        FRAME_FORMAT_TEST(picoquic_format_path_cid_blocked_frame, bytes, bytes_max, 123, 0, &more_data);
         FRAME_FORMAT_TEST(picoquic_format_observed_address_frame, bytes, bytes_max, picoquic_frame_type_observed_address_v4, 13, addr_bytes, 4433, &more_data);
     }