fully integrated explicit path ID

qdeconinck · Feb 29, 2024 · 613c41c · 613c41c
1 parent 9977a07
commit 613c41c
Show file tree

Hide file tree

Showing 6 changed files with 417 additions and 206 deletions.
diff --git a/apps/src/bin/quiche-server.rs b/apps/src/bin/quiche-server.rs
@@ -512,14 +512,20 @@ fn main() {
                 clients_ids.remove(&retired_scid);
             }
 
-            // Provides as many CIDs as possible.
-            while client.conn.scids_left() > 0 {
-                let (scid, reset_token) = generate_cid_and_reset_token(&rng);
-                if client.conn.new_scid(&scid, reset_token, false).is_err() {
-                    break;
-                }
+            for path_id in client.conn.path_ids() {
+                // Provides as many CIDs as possible.
+                while client.conn.scids_left_on_path(path_id) > 0 {
+                    let (scid, reset_token) = generate_cid_and_reset_token(&rng);
+                    if client
+                        .conn
+                        .new_scid_on_path(path_id, &scid, reset_token, false)
+                        .is_err()
+                    {
+                        break;
+                    }
 
-                clients_ids.insert(scid, client.client_id);
+                    clients_ids.insert(scid, client.client_id);
+                }
             }
         }
 

diff --git a/apps/src/client.rs b/apps/src/client.rs
@@ -472,14 +472,19 @@ pub fn connect(
         }
 
         // Provides as many CIDs as possible.
-        while conn.scids_left() > 0 {
-            let (scid, reset_token) = generate_cid_and_reset_token(&rng);
+        for path_id in conn.path_ids() {
+            while conn.scids_left_on_path(path_id) > 0 {
+                let (scid, reset_token) = generate_cid_and_reset_token(&rng);
 
-            if conn.new_scid(&scid, reset_token, false).is_err() {
-                break;
-            }
+                if conn
+                    .new_scid_on_path(path_id, &scid, reset_token, false)
+                    .is_err()
+                {
+                    break;
+                }
 
-            scid_sent = true;
+                scid_sent = true;
+            }
         }
 
         if conn_args.initial_max_paths.is_some() &&