fix: allow re-allocate

Author: mycrl

Cargo.lock

@@ -549,10 +549,10 @@ mod tests {
         let turn_3_port = turn_3.allocate().await?;
         let turn_4_port = turn_4.allocate().await?;
 
-        assert!(turn_1.allocate().await.is_err());
-        assert!(turn_2.allocate().await.is_err());
-        assert!(turn_3.allocate().await.is_err());
-        assert!(turn_4.allocate().await.is_err());
+        assert_eq!(turn_1.allocate().await?, turn_1_port);
+        assert_eq!(turn_2.allocate().await?, turn_2_port);
+        assert_eq!(turn_3.allocate().await?, turn_3_port);
+        assert_eq!(turn_4.allocate().await?, turn_4_port);
 
         {
             turn_1.create_permission(turn_2_port).await?;
@@ -579,14 +579,14 @@ mod tests {
             turn_4.channel_bind(turn_1_port, 0x4002).await?;
             turn_4.refresh(600).await?;
 
-            assert!(turn_1.channel_bind(turn_2_port, 0x4000).await.is_err());
-            assert!(turn_1.channel_bind(turn_3_port, 0x4001).await.is_err());
-            assert!(turn_1.channel_bind(turn_4_port, 0x4002).await.is_err());
-            assert!(turn_2.channel_bind(turn_1_port, 0x4000).await.is_err());
-            assert!(turn_2.channel_bind(turn_3_port, 0x4002).await.is_err());
-            assert!(turn_3.channel_bind(turn_1_port, 0x4001).await.is_err());
-            assert!(turn_3.channel_bind(turn_2_port, 0x4002).await.is_err());
-            assert!(turn_4.channel_bind(turn_1_port, 0x4002).await.is_err());
+            assert!(turn_1.channel_bind(turn_2_port, 0x4000).await.is_ok());
+            assert!(turn_1.channel_bind(turn_3_port, 0x4001).await.is_ok());
+            assert!(turn_1.channel_bind(turn_4_port, 0x4002).await.is_ok());
+            assert!(turn_2.channel_bind(turn_1_port, 0x4000).await.is_ok());
+            assert!(turn_2.channel_bind(turn_3_port, 0x4002).await.is_ok());
+            assert!(turn_3.channel_bind(turn_1_port, 0x4001).await.is_ok());
+            assert!(turn_3.channel_bind(turn_2_port, 0x4002).await.is_ok());
+            assert!(turn_4.channel_bind(turn_1_port, 0x4002).await.is_ok());
         }
 
         {

tests/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "turn-server"
-version = "3.3.3"
+version = "3.3.4"
 edition = "2021"
 authors = ["mycrl <[email protected]>"]
 description = "A pure rust-implemented turn server."

turn-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "turn"
-version = "1.3.0"
+version = "1.3.1"
 edition = "2021"
 authors = ["mycrl <[email protected]>"]
 description = "A library for handling round sessions."

turn/Cargo.toml

@@ -483,15 +483,15 @@ impl<T: Observer + 'static> Sessions<T> {
     ///     assert_eq!(session.allocate.channels.len(), 0);
     /// }
     ///
-    /// assert!(sessions.allocate(&addr).is_none());
+    /// assert_eq!(sessions.allocate(&addr), Some(port));
     /// ```
     pub fn allocate(&self, addr: &SessionAddr) -> Option<u16> {
         let mut lock = self.state.sessions.write();
         let session = lock.get_mut(addr)?;
 
         // If the port has already been allocated, re-allocation is not allowed.
-        if session.allocate.port.is_some() {
-            return None;
+        if let Some(port) = session.allocate.port {
+            return Some(port);
         }
 
         // Records the port assigned to the current session and resets the alive time.
@@ -735,8 +735,6 @@ impl<T: Observer + 'static> Sessions<T> {
 
             if !session.allocate.channels.contains(&channel) {
                 session.allocate.channels.push(channel);
-            } else {
-                return false;
             }
         }