From b75f0a2c47eca9eed071dcee7393072bfe19fb9a Mon Sep 17 00:00:00 2001 From: Toshit Chawda Date: Mon, 18 Nov 2024 20:56:36 -0800 Subject: [PATCH] add back handle_handshake calls --- wisp/src/mux/client.rs | 8 +++++++- wisp/src/mux/server.rs | 10 ++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/wisp/src/mux/client.rs b/wisp/src/mux/client.rs index bf00b93..80a8031 100644 --- a/wisp/src/mux/client.rs +++ b/wisp/src/mux/client.rs @@ -44,10 +44,16 @@ async fn handshake( (closure)(&mut builders).await?; send_info_packet(tx, &mut builders).await?; + let mut supported_extensions = get_supported_extensions(info.extensions, &mut builders); + + for extension in supported_extensions.iter_mut() { + extension.handle_handshake(rx, tx).await?; + } + Ok(( WispHandshakeResult { kind: WispHandshakeResultKind::V2 { - extensions: get_supported_extensions(info.extensions, &mut builders), + extensions: supported_extensions, }, downgraded: false, }, diff --git a/wisp/src/mux/server.rs b/wisp/src/mux/server.rs index cd628ab..31a3f56 100644 --- a/wisp/src/mux/server.rs +++ b/wisp/src/mux/server.rs @@ -44,10 +44,16 @@ async fn handshake( Packet::maybe_parse_info(rx.wisp_read_frame(tx).await?, Role::Server, &mut builders)?; if let PacketType::Info(info) = packet.packet_type { + let mut supported_extensions = get_supported_extensions(info.extensions, &mut builders); + + for extension in supported_extensions.iter_mut() { + extension.handle_handshake(rx, tx).await?; + } + // v2 client Ok(WispHandshakeResult { kind: WispHandshakeResultKind::V2 { - extensions: get_supported_extensions(info.extensions, &mut builders), + extensions: supported_extensions, }, downgraded: false, }) @@ -55,7 +61,7 @@ async fn handshake( // downgrade to v1 Ok(WispHandshakeResult { kind: WispHandshakeResultKind::V1 { - frame: Some(packet.into()), + frame: Some(packet), }, downgraded: true, })