Promote create_agent lock to top of function, to avoid race condition (#290)

* Promote lock to top of function, to avoid race condition

Author: efer-ms

ice/CHANGELOG.md

@@ -1,6 +1,7 @@
 # webrtc-ice changelog
 
 ## Unreleased
+* Promote agent lock in ice_gather.rs create_agent() to top level of the function to avoid a race condition. [#290 Promote create_agent lock to top of function, to avoid race condition](https://github.com/webrtc-rs/webrtc/pull/290) contributed by [efer-ms](https://github.com/efer-ms)
 
 ### v0.8.0
 

webrtc/src/ice_transport/ice_gatherer.rs

@@ -79,11 +79,14 @@ impl RTCIceGatherer {
     }
 
     pub(crate) async fn create_agent(&self) -> Result<()> {
-        {
-            let agent = self.agent.lock().await;
-            if agent.is_some() || self.state() != RTCIceGathererState::New {
-                return Ok(());
-            }
+        // NOTE: A lock is held for the duration of this function in order to
+        // avoid potential double-agent creations. Care should be taken to
+        // ensure we do not do anything expensive other than the actual agent
+        // creation in this function.
+
+        let mut agent = self.agent.lock().await;
+        if agent.is_some() || self.state() != RTCIceGathererState::New {
+            return Ok(());
         }
 
         let mut candidate_types = vec![];
@@ -145,10 +148,7 @@ impl RTCIceGatherer {
 
         config.network_types.extend(requested_network_types);
 
-        {
-            let mut agent = self.agent.lock().await;
-            *agent = Some(Arc::new(ice::agent::Agent::new(config).await?));
-        }
+        *agent = Some(Arc::new(ice::agent::Agent::new(config).await?));
 
         Ok(())
     }