ffi: fix compilation errors

Author: qdeconinck

quiche/include/quiche.h

@@ -763,17 +763,19 @@ int quiche_conn_new_scid(quiche_conn *conn,
 // Requests the stack to perform path validation of the proposed 4-tuple.
 int quiche_conn_probe_path(quiche_conn *conn,
                                 const struct sockaddr *local, socklen_t local_len,
-                                const struct sockaddr *peer, socklen_t peer_len, uint64_t *seq);
+                                const struct sockaddr *peer, socklen_t peer_len, uint64_t *path_id,
+                                uint64_t *cid_seq);
 
 // Migrates the connection to a new local address.
-int quiche_conn_migrate_source(quiche_conn *conn, const struct sockaddr *local, socklen_t local_len, uint64_t *seq);
+int quiche_conn_migrate_source(quiche_conn *conn, const struct sockaddr *local, socklen_t local_len,
+                                uint64_t *path_id, uint64_t *cid_seq);
 
 // Migrates the connection over the given network path between "local"
 // and "peer".
 int quiche_conn_migrate(quiche_conn *conn,
                              const struct sockaddr *local, socklen_t local_len,
                              const struct sockaddr *peer, socklen_t peer_len,
-                             uint64_t *seq);
+                             uint64_t *path_id, uint64_t *cid_seq);
 
 enum quiche_path_event_type {
     QUICHE_PATH_EVENT_NEW,
@@ -787,7 +789,7 @@ enum quiche_path_event_type {
 typedef struct quiche_path_event quiche_path_event;
 
 // Retrieves the next event. Returns NULL if there is no event to process.
-const quiche_path_event *quiche_conn_path_event_next(quiche_conn *conn);
+const quiche_path_event *quiche_conn_path_event_next(quiche_conn *conn, uint64_t *path_id);
 
 // Returns the type of the event.
 enum quiche_path_event_type quiche_path_event_type(quiche_path_event *ev);

quiche/src/ffi.rs

@@ -1609,13 +1609,13 @@ pub extern fn quiche_conn_is_path_validated(
 #[no_mangle]
 pub extern fn quiche_conn_probe_path(
     conn: &mut Connection, local: &sockaddr, local_len: socklen_t,
-    peer: &sockaddr, peer_len: socklen_t, seq: *mut u64,
+    peer: &sockaddr, peer_len: socklen_t, path_id: *mut u64, cid_seq: *mut u64,
 ) -> c_int {
     let local = std_addr_from_c(local, local_len);
     let peer = std_addr_from_c(peer, peer_len);
     match conn.probe_path(local, peer) {
         Ok(v) => {
-            unsafe { *seq = v }
+            unsafe { (*path_id, *cid_seq) = v }
             0
         },
         Err(e) => e.to_c() as c_int,
@@ -1624,12 +1624,13 @@ pub extern fn quiche_conn_probe_path(
 
 #[no_mangle]
 pub extern fn quiche_conn_migrate_source(
-    conn: &mut Connection, local: &sockaddr, local_len: socklen_t, seq: *mut u64,
+    conn: &mut Connection, local: &sockaddr, local_len: socklen_t,
+    path_id: *mut u64, cid_seq: *mut u64,
 ) -> c_int {
     let local = std_addr_from_c(local, local_len);
     match conn.migrate_source(local) {
         Ok(v) => {
-            unsafe { *seq = v }
+            unsafe { (*path_id, *cid_seq) = v }
             0
         },
         Err(e) => e.to_c() as c_int,
@@ -1639,13 +1640,13 @@ pub extern fn quiche_conn_migrate_source(
 #[no_mangle]
 pub extern fn quiche_conn_migrate(
     conn: &mut Connection, local: &sockaddr, local_len: socklen_t,
-    peer: &sockaddr, peer_len: socklen_t, seq: *mut u64,
+    peer: &sockaddr, peer_len: socklen_t, path_id: *mut u64, cid_seq: *mut u64,
 ) -> c_int {
     let local = std_addr_from_c(local, local_len);
     let peer = std_addr_from_c(peer, peer_len);
     match conn.migrate(local, peer) {
         Ok(v) => {
-            unsafe { *seq = v }
+            unsafe { (*path_id, *cid_seq) = v }
             0
         },
         Err(e) => e.to_c() as c_int,
@@ -1654,10 +1655,13 @@ pub extern fn quiche_conn_migrate(
 
 #[no_mangle]
 pub extern fn quiche_conn_path_event_next(
-    conn: &mut Connection,
+    conn: &mut Connection, path_id: *mut u64,
 ) -> *const PathEvent {
     match conn.path_event_next() {
-        Some(v) => Box::into_raw(Box::new(v)),
+        Some((pid, e)) => {
+            unsafe { *path_id = pid }
+            Box::into_raw(Box::new(e))
+        },
         None => ptr::null(),
     }
 }
@@ -1676,6 +1680,8 @@ pub extern fn quiche_path_event_type(ev: &PathEvent) -> u32 {
         PathEvent::ReusedSourceConnectionId { .. } => 4,
 
         PathEvent::PeerMigrated { .. } => 5,
+
+        PathEvent::PeerPathStatus { .. } => 6,
     }
 }
 
@@ -1734,7 +1740,7 @@ pub extern fn quiche_path_event_closed(
     peer_addr_len: &mut socklen_t,
 ) {
     match ev {
-        PathEvent::Closed(local, peer) => {
+        PathEvent::Closed(local, peer, ..) => {
             *local_addr_len = std_addr_to_c(local, local_addr);
             *peer_addr_len = std_addr_to_c(peer, peer_addr)
         },

quiche/src/lib.rs

@@ -707,6 +707,7 @@ impl Error {
             Error::CryptoBufferExceeded => -20,
             Error::UnavailablePath => -21,
             Error::MultiPathViolation => -22,
+            Error::OutOfPathId => -23,
         }
     }
 }