fix: whipinto and whepfrom ice candidate

binbat · Mar 5, 2024 · 48348f7 · 48348f7
1 parent 5b53180
commit 48348f7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/tools/whepfrom/src/main.rs b/tools/whepfrom/src/main.rs
@@ -137,9 +137,19 @@ async fn webrtc_start(
     )
     .await?;
     let offer = peer.create_offer(None).await?;
-    let (answer, _ice_servers) = client.wish(offer.sdp.clone()).await?;
-    peer.set_local_description(offer.clone()).await?;
-    peer.set_remote_description(answer).await?;
+
+    let mut gather_complete = peer.gathering_complete_promise().await;
+    peer.set_local_description(offer).await?;
+    let _ = gather_complete.recv().await;
+
+    let (answer, _ice_servers) = client
+        .wish(peer.local_description().await.unwrap().sdp.clone())
+        .await?;
+
+    peer.set_remote_description(answer)
+        .await
+        .map_err(|error| anyhow!(format!("{:?}: {}", error, error)))?;
+
     Ok(peer)
 }
 

diff --git a/tools/whipinto/src/main.rs b/tools/whipinto/src/main.rs
@@ -123,9 +123,19 @@ async fn webrtc_start(
 ) -> Result<(Arc<RTCPeerConnection>, UnboundedSender<Vec<u8>>)> {
     let (peer, sender) = new_peer(codec, complete_tx.clone()).await?;
     let offer = peer.create_offer(None).await?;
-    let (answer, _ice_servers) = client.wish(offer.sdp.clone()).await?;
-    peer.set_local_description(offer.clone()).await?;
-    peer.set_remote_description(answer).await?;
+
+    let mut gather_complete = peer.gathering_complete_promise().await;
+    peer.set_local_description(offer).await?;
+    let _ = gather_complete.recv().await;
+
+    let (answer, _ice_servers) = client
+        .wish(peer.local_description().await.unwrap().sdp)
+        .await?;
+
+    peer.set_remote_description(answer)
+        .await
+        .map_err(|error| anyhow!(format!("{:?}: {}", error, error)))?;
+
     Ok((peer, sender))
 }