diff options
Diffstat (limited to 'tools/apps/src')
| -rw-r--r-- | tools/apps/src/bin/quiche-server.rs | 10 | ||||
| -rw-r--r-- | tools/apps/src/client.rs | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/tools/apps/src/bin/quiche-server.rs b/tools/apps/src/bin/quiche-server.rs index 3004d877..2bc3ddc9 100644 --- a/tools/apps/src/bin/quiche-server.rs +++ b/tools/apps/src/bin/quiche-server.rs @@ -252,6 +252,7 @@ fn main() { if token.is_empty() { warn!("Doing stateless retry"); + let scid = quiche::ConnectionId::from_ref(&scid); let new_token = mint_token(&hdr, &src); let len = quiche::retry( @@ -281,7 +282,7 @@ fn main() { // The token was not valid, meaning the retry failed, so // drop the packet. - if odcid == None { + if odcid.is_none() { error!("Invalid address validation token"); continue; } @@ -301,7 +302,8 @@ fn main() { debug!("New connection: dcid={:?} scid={:?}", hdr.dcid, scid); #[allow(unused_mut)] - let mut conn = quiche::accept(&scid, odcid, &mut config).unwrap(); + let mut conn = + quiche::accept(&scid, odcid.as_ref(), &mut config).unwrap(); if let Some(keylog) = &mut keylog { if let Ok(keylog) = keylog.try_clone() { @@ -525,7 +527,7 @@ fn mint_token(hdr: &quiche::Header, src: &net::SocketAddr) -> Vec<u8> { /// authenticate of the token. *It should not be used in production system*. fn validate_token<'a>( src: &net::SocketAddr, token: &'a [u8], -) -> Option<&'a [u8]> { +) -> Option<quiche::ConnectionId<'a>> { if token.len() < 6 { return None; } @@ -547,5 +549,5 @@ fn validate_token<'a>( let token = &token[addr.len()..]; - Some(&token[..]) + Some(quiche::ConnectionId::from_ref(&token[..])) } diff --git a/tools/apps/src/client.rs b/tools/apps/src/client.rs index 58df1944..f75af336 100644 --- a/tools/apps/src/client.rs +++ b/tools/apps/src/client.rs @@ -146,10 +146,10 @@ pub fn connect( let mut app_proto_selected = false; // Generate a random source connection ID for the connection. - let mut scid = vec![0; quiche::MAX_CONN_ID_LEN]; + let mut scid = [0; quiche::MAX_CONN_ID_LEN]; SystemRandom::new().fill(&mut scid[..]).unwrap(); - let scid = quiche::ConnectionId::from_vec(scid); + let scid = quiche::ConnectionId::from_ref(&scid); // Create a QUIC connection and initiate handshake. let mut conn = |