Merge branch 'master' into unmarshal-optimization

yngrtc · web-flow · commit 43f8e8b4a534 · 2023-06-04T09:48:32.000-07:00
diff --git a/examples/examples/signal/Cargo.toml b/examples/examples/signal/Cargo.toml
@@ -8,6 +8,6 @@ edition = "2021"
 [dependencies]
 tokio = { version = "1.15.0", features = ["full"] }
 anyhow = "1.0.52"
-base64 = "0.13.0"
+base64 = "0.21.2"
 lazy_static = "1.4"
 hyper = { version = "0.14.16", features = ["full"] }
diff --git a/examples/examples/signal/src/lib.rs b/examples/examples/signal/src/lib.rs
@@ -2,6 +2,8 @@
 #![allow(dead_code)]
 
 use anyhow::Result;
+use base64::prelude::BASE64_STANDARD;
+use base64::Engine;
 use hyper::service::{make_service_fn, service_fn};
 use hyper::{Body, Method, Request, Response, Server, StatusCode};
 use std::net::SocketAddr;
@@ -92,13 +94,13 @@ pub fn encode(b: &str) -> String {
     //    b = zip(b)
     //}
 
-    base64::encode(b)
+    BASE64_STANDARD.encode(b)
 }
 
 /// decode decodes the input from base64
 /// It can optionally unzip the input after decoding
 pub fn decode(s: &str) -> Result<String> {
-    let b = base64::decode(s)?;
+    let b = BASE64_STANDARD.decode(s)?;
 
     //if COMPRESS {
     //    b = unzip(b)
diff --git a/stun/Cargo.toml b/stun/Cargo.toml
@@ -21,7 +21,7 @@ tokio = { version = "1.19", features = ["full"] }
 lazy_static = "1.4"
 url = "2.2"
 rand = "0.8.5"
-base64 = "0.13.0"
+base64 = "0.21.2"
 subtle = "2.4"
 crc = "3.0"
 ring = "0.16.20"
diff --git a/stun/benches/bench.rs b/stun/benches/bench.rs
@@ -1,3 +1,5 @@
+use base64::prelude::BASE64_STANDARD;
+use base64::Engine;
 use criterion::{criterion_group, criterion_main, Criterion};
 use rand::rngs::StdRng;
 use rand::{Rng, SeedableRng};
@@ -623,7 +625,7 @@ fn benchmark_xoraddr(c: &mut Criterion) {
 
     {
         let mut m = Message::new();
-        let transaction_id = base64::decode("jxhBARZwX+rsC6er").unwrap();
+        let transaction_id = BASE64_STANDARD.decode("jxhBARZwX+rsC6er").unwrap();
 
         m.transaction_id.0.copy_from_slice(&transaction_id);
         let addr_value = [0, 1, 156, 213, 244, 159, 56, 174]; //hex.DecodeString("00019cd5f49f38ae")
diff --git a/stun/examples/stun_decode.rs b/stun/examples/stun_decode.rs
@@ -1,3 +1,5 @@
+use base64::prelude::BASE64_STANDARD;
+use base64::Engine;
 use clap::{App, Arg};
 
 use stun::message::Message;
@@ -28,7 +30,7 @@ fn main() {
     }
 
     let encoded_data = matches.value_of("data").unwrap();
-    let decoded_data = match base64::decode(encoded_data) {
+    let decoded_data = match BASE64_STANDARD.decode(encoded_data) {
         Ok(d) => d,
         Err(e) => panic!("Unable to decode base64 value: {e}"),
     };
diff --git a/stun/src/message.rs b/stun/src/message.rs
@@ -5,6 +5,8 @@ use crate::agent::*;
 use crate::attributes::*;
 use crate::error::*;
 
+use base64::prelude::BASE64_STANDARD;
+use base64::Engine;
 use rand::Rng;
 use std::fmt;
 use std::io::{Read, Write};
@@ -64,7 +66,7 @@ pub struct Message {
 
 impl fmt::Display for Message {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let t_id = base64::encode(self.transaction_id.0);
+        let t_id = BASE64_STANDARD.encode(self.transaction_id.0);
         write!(
             f,
             "{} l={} attrs={} id={}",
diff --git a/stun/src/xoraddr/xoraddr_test.rs b/stun/src/xoraddr/xoraddr_test.rs
@@ -1,6 +1,8 @@
 use super::*;
 use crate::checks::*;
 
+use base64::prelude::BASE64_STANDARD;
+use base64::Engine;
 use std::io::BufReader;
 
 #[test]
@@ -36,7 +38,7 @@ fn test_xor_safe_bsmaller() -> Result<()> {
 #[test]
 fn test_xormapped_address_get_from() -> Result<()> {
     let mut m = Message::new();
-    let transaction_id = base64::decode("jxhBARZwX+rsC6er").unwrap();
+    let transaction_id = BASE64_STANDARD.decode("jxhBARZwX+rsC6er").unwrap();
     m.transaction_id.0.copy_from_slice(&transaction_id);
     let addr_value = vec![0x00, 0x01, 0x9c, 0xd5, 0xf4, 0x9f, 0x38, 0xae];
     m.add(ATTR_XORMAPPED_ADDRESS, &addr_value);
@@ -104,7 +106,7 @@ fn test_xormapped_address_get_from() -> Result<()> {
 #[test]
 fn test_xormapped_address_get_from_invalid() -> Result<()> {
     let mut m = Message::new();
-    let transaction_id = base64::decode("jxhBARZwX+rsC6er").unwrap();
+    let transaction_id = BASE64_STANDARD.decode("jxhBARZwX+rsC6er").unwrap();
     m.transaction_id.0.copy_from_slice(&transaction_id);
     let expected_ip: IpAddr = "213.141.156.236".parse().unwrap();
     let expected_port = 21254u16;
@@ -134,7 +136,7 @@ fn test_xormapped_address_get_from_invalid() -> Result<()> {
 #[test]
 fn test_xormapped_address_add_to() -> Result<()> {
     let mut m = Message::new();
-    let transaction_id = base64::decode("jxhBARZwX+rsC6er").unwrap();
+    let transaction_id = BASE64_STANDARD.decode("jxhBARZwX+rsC6er").unwrap();
     m.transaction_id.0.copy_from_slice(&transaction_id);
     let expected_ip: IpAddr = "213.141.156.236".parse().unwrap();
     let expected_port = 21254u16;
@@ -166,7 +168,7 @@ fn test_xormapped_address_add_to() -> Result<()> {
 #[test]
 fn test_xormapped_address_add_to_ipv6() -> Result<()> {
     let mut m = Message::new();
-    let transaction_id = base64::decode("jxhBARZwX+rsC6er").unwrap();
+    let transaction_id = BASE64_STANDARD.decode("jxhBARZwX+rsC6er").unwrap();
     m.transaction_id.0.copy_from_slice(&transaction_id);
     let expected_ip: IpAddr = "fe80::dc2b:44ff:fe20:6009".parse().unwrap();
     let expected_port = 21254u16;
diff --git a/turn/Cargo.toml b/turn/Cargo.toml
@@ -20,7 +20,7 @@ stun = { version = "0.4.3", path = "../stun" }
 tokio = { version = "1.19", features = ["full"] }
 async-trait = "0.1.56"
 log = "0.4.16"
-base64 = "0.13.0"
+base64 = "0.21.2"
 rand = "0.8.5"
 ring = "0.16.20"
 md-5 = "0.10.1"
diff --git a/turn/src/auth/mod.rs b/turn/src/auth/mod.rs
@@ -6,6 +6,8 @@ use crate::error::*;
 use std::net::SocketAddr;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
+use base64::prelude::BASE64_STANDARD;
+use base64::Engine;
 use md5::{Digest, Md5};
 use ring::hmac;
 
@@ -30,7 +32,7 @@ fn long_term_credentials(username: &str, shared_secret: &str) -> String {
         shared_secret.as_bytes(),
     );
     let password = hmac::sign(&mac, username.as_bytes()).as_ref().to_vec();
-    base64::encode(password)
+    BASE64_STANDARD.encode(password)
 }
 
 // generate_auth_key is a convenience function to easily generate keys in the format used by AuthHandler
diff --git a/turn/src/client/mod.rs b/turn/src/client/mod.rs
@@ -11,6 +11,8 @@ use crate::error::*;
 use crate::proto::{
     chandata::*, data::*, lifetime::*, peeraddr::*, relayaddr::*, reqtrans::*, PROTO_UDP,
 };
+use base64::prelude::BASE64_STANDARD;
+use base64::Engine;
 use binding::*;
 use relay_conn::*;
 use transaction::*;
@@ -103,7 +105,7 @@ impl RelayConnObserver for ClientInternal {
         to: &str,
         ignore_result: bool,
     ) -> Result<TransactionResult> {
-        let tr_key = base64::encode(msg.transaction_id.0);
+        let tr_key = BASE64_STANDARD.encode(msg.transaction_id.0);
 
         let mut tr = Transaction::new(TransactionConfig {
             key: tr_key.clone(),
@@ -341,7 +343,7 @@ impl ClientInternal {
         // - stun.ClassSuccessResponse
         // - stun.ClassErrorResponse
 
-        let tr_key = base64::encode(msg.transaction_id.0);
+        let tr_key = BASE64_STANDARD.encode(msg.transaction_id.0);
 
         let mut tm = tr_map.lock().await;
         if tm.find(&tr_key).is_none() {
diff --git a/webrtc/Cargo.toml b/webrtc/Cargo.toml
@@ -40,6 +40,7 @@ bytes = "1"
 thiserror = "1.0"
 waitgroup = "0.1.2"
 regex = "1.7.1"
+smol_str = "0.2.0"
 url = "2.2"
 rustls = { version = "0.19.0", features = ["dangerous_configuration"]}
 rcgen = { version = "0.10.0", features = ["pem", "x509-parser"]}
diff --git a/webrtc/src/lib.rs b/webrtc/src/lib.rs
@@ -12,6 +12,8 @@ pub use rtcp;
 pub use rtp;
 pub use sctp;
 pub use sdp;
+use serde::{Deserialize, Serialize};
+use smol_str::SmolStr;
 pub use srtp;
 pub use stun;
 pub use turn;
@@ -43,3 +45,25 @@ pub(crate) const SDP_ATTRIBUTE_RID: &str = "rid";
 pub(crate) const GENERATED_CERTIFICATE_ORIGIN: &str = "WebRTC";
 pub(crate) const SDES_REPAIR_RTP_STREAM_ID_URI: &str =
     "urn:ietf:params:rtp-hdrext:sdes:repaired-rtp-stream-id";
+
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct SmallStr(SmolStr);
+
+impl Serialize for SmallStr {
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serializer.serialize_str(self.0.as_str())
+    }
+}
+
+impl<'de> Deserialize<'de> for SmallStr {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let s = String::deserialize(deserializer)?;
+        Ok(SmallStr(SmolStr::new(s)))
+    }
+}
diff --git a/webrtc/src/peer_connection/mod.rs b/webrtc/src/peer_connection/mod.rs
@@ -66,6 +66,7 @@ use crate::sctp_transport::RTCSctpTransport;
 use crate::stats::StatsReport;
 use crate::track::track_local::TrackLocal;
 use crate::track::track_remote::TrackRemote;
+use crate::SmallStr;
 
 use ::ice::candidate::candidate_base::unmarshal_candidate;
 use ::ice::candidate::Candidate;
@@ -77,6 +78,7 @@ use interceptor::{stats, Attributes, Interceptor, RTCPWriter};
 use peer_connection_internal::*;
 use rand::{thread_rng, Rng};
 use rcgen::KeyPair;
+use smol_str::SmolStr;
 use srtp::stream::Stream;
 use std::future::Future;
 use std::pin::Pin;
@@ -454,7 +456,9 @@ impl RTCPeerConnection {
                 // 	return true
                 // }
                 let mid = t.mid();
-                let m = mid.as_ref().and_then(|mid| get_by_mid(mid, local_desc));
+                let m = mid
+                    .as_ref()
+                    .and_then(|mid| get_by_mid(mid.0.as_str(), local_desc));
                 // Step 5.2
                 if !t.stopped.load(Ordering::SeqCst) {
                     if m.is_none() {
@@ -493,8 +497,9 @@ impl RTCPeerConnection {
                             RTCSdpType::Offer => {
                                 // Step 5.3.2
                                 if let Some(remote_desc) = &current_remote_description {
-                                    if let Some(rm) =
-                                        t.mid().and_then(|mid| get_by_mid(&mid, remote_desc))
+                                    if let Some(rm) = t
+                                        .mid()
+                                        .and_then(|mid| get_by_mid(mid.0.as_str(), remote_desc))
                                     {
                                         if get_peer_direction(m) != t.direction()
                                             && get_peer_direction(rm) != t.direction().reverse()
@@ -511,18 +516,20 @@ impl RTCPeerConnection {
                                     Some(d) => d,
                                     None => return true,
                                 };
-                                let offered_direction =
-                                    match t.mid().and_then(|mid| get_by_mid(&mid, remote_desc)) {
-                                        Some(d) => {
-                                            let dir = get_peer_direction(d);
-                                            if dir == RTCRtpTransceiverDirection::Unspecified {
-                                                RTCRtpTransceiverDirection::Inactive
-                                            } else {
-                                                dir
-                                            }
+                                let offered_direction = match t
+                                    .mid()
+                                    .and_then(|mid| get_by_mid(mid.0.as_str(), remote_desc))
+                                {
+                                    Some(d) => {
+                                        let dir = get_peer_direction(d);
+                                        if dir == RTCRtpTransceiverDirection::Unspecified {
+                                            RTCRtpTransceiverDirection::Inactive
+                                        } else {
+                                            dir
                                         }
-                                        None => RTCRtpTransceiverDirection::Inactive,
-                                    };
+                                    }
+                                    None => RTCRtpTransceiverDirection::Inactive,
+                                };
 
                                 let current_direction = get_peer_direction(m);
                                 // Step 5.3.3
@@ -544,8 +551,8 @@ impl RTCPeerConnection {
                     };
 
                     if let Some(remote_desc) = &*params.current_remote_description.lock().await {
-                        return get_by_mid(&search_mid, local_desc).is_some()
-                            || get_by_mid(&search_mid, remote_desc).is_some();
+                        return get_by_mid(search_mid.0.as_str(), local_desc).is_some()
+                            || get_by_mid(search_mid.0.as_str(), remote_desc).is_some();
                     }
                 }
             }
@@ -795,10 +802,13 @@ impl RTCPeerConnection {
                         }
                     }
 
-                    t.set_mid(mid)?;
+                    t.set_mid(crate::SmallStr(SmolStr::from(mid)))?;
                 } else {
                     let greater_mid = self.internal.greater_mid.fetch_add(1, Ordering::SeqCst);
-                    t.set_mid(format!("{}", greater_mid + 1))?;
+                    t.set_mid(crate::SmallStr(SmolStr::from(format!(
+                        "{}",
+                        greater_mid + 1
+                    ))))?;
                 }
             }
 
@@ -1358,7 +1368,7 @@ impl RTCPeerConnection {
 
                         if let Some(t) = t {
                             if t.mid().is_none() {
-                                t.set_mid(mid_value.to_owned())?;
+                                t.set_mid(crate::SmallStr(SmolStr::from(mid_value)))?;
                             }
                         } else {
                             let local_direction =
@@ -1404,7 +1414,7 @@ impl RTCPeerConnection {
                             self.internal.add_rtp_transceiver(Arc::clone(&t)).await;
 
                             if t.mid().is_none() {
-                                t.set_mid(mid_value.to_owned())?;
+                                t.set_mid(SmallStr(SmolStr::from(mid_value)))?;
                             }
                         }
                     }
diff --git a/webrtc/src/peer_connection/peer_connection_internal.rs b/webrtc/src/peer_connection/peer_connection_internal.rs
diff --git a/webrtc/src/peer_connection/sdp/mod.rs b/webrtc/src/peer_connection/sdp/mod.rs
diff --git a/webrtc/src/rtp_transceiver/mod.rs b/webrtc/src/rtp_transceiver/mod.rs
diff --git a/webrtc/src/rtp_transceiver/rtp_receiver/mod.rs b/webrtc/src/rtp_transceiver/rtp_receiver/mod.rs
diff --git a/webrtc/src/stats/mod.rs b/webrtc/src/stats/mod.rs
diff --git a/webrtc/src/track/track_remote/mod.rs b/webrtc/src/track/track_remote/mod.rs
