Rust WIP 2: almost done but tests die

versatica · Jan 2, 2024 · 395dcd0 · 395dcd0
1 parent 491b8c8
commit 395dcd0
Show file tree

Hide file tree

Showing 25 changed files with 119 additions and 0 deletions.
diff --git a/rust/examples/echo.rs b/rust/examples/echo.rs
@@ -187,6 +187,7 @@ impl EchoConnection {
                 ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                 announced_ip: None,
                 port: None,
+                flags: None,
                 send_buffer_size: None,
                 recv_buffer_size: None,
             }));

diff --git a/rust/examples/multiopus.rs b/rust/examples/multiopus.rs
@@ -150,6 +150,7 @@ impl EchoConnection {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: None,
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 });
@@ -235,6 +236,7 @@ impl EchoConnection {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: None,
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 }),

diff --git a/rust/examples/svc-simulcast.rs b/rust/examples/svc-simulcast.rs
@@ -207,6 +207,7 @@ impl SvcSimulcastConnection {
                 ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                 announced_ip: None,
                 port: None,
+                flags: None,
                 send_buffer_size: None,
                 recv_buffer_size: None,
             }));

diff --git a/rust/examples/videoroom.rs b/rust/examples/videoroom.rs
@@ -501,6 +501,7 @@ mod participant {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: None,
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 }));

diff --git a/rust/src/data_structures.rs b/rust/src/data_structures.rs
@@ -62,6 +62,9 @@ pub struct ListenInfo {
     /// Listening port.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub port: Option<u16>,
+    /// Socket flags.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub flags: Option<SocketFlags>,
     /// Send buffer size (bytes).
     #[serde(skip_serializing_if = "Option::is_none")]
     pub send_buffer_size: Option<u32>,
@@ -80,12 +83,33 @@ impl ListenInfo {
             ip: self.ip.to_string(),
             announced_ip: self.announced_ip.map(|ip| ip.to_string()),
             port: self.port.unwrap_or(0),
+            flags: self.flags.map(|flags| Box::new(flags.to_fbs())),
             send_buffer_size: self.send_buffer_size.unwrap_or(0),
             recv_buffer_size: self.recv_buffer_size.unwrap_or(0),
         }
     }
 }
 
+/// UDP/TCP socket flags.
+#[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SocketFlags {
+    /// Disable dual-stack support so only IPv6 is used (only if ip is IPv6).
+    pub ipv6_only: bool,
+    /// Make different transports bind to the same ip and port (only for UDP).
+    /// Useful for multicast scenarios with plain transport. Use with caution.
+    pub udp_reuse_port: bool,
+}
+
+impl SocketFlags {
+    pub(crate) fn to_fbs(self) -> transport::SocketFlags {
+        transport::SocketFlags {
+            ipv6_only: self.ipv6_only,
+            udp_reuse_port: self.udp_reuse_port,
+        }
+    }
+}
+
 /// ICE role.
 #[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]

diff --git a/rust/src/router.rs b/rust/src/router.rs
@@ -147,6 +147,7 @@ impl PipeToRouterOptions {
                 ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                 announced_ip: None,
                 port: None,
+                flags: None,
                 send_buffer_size: None,
                 recv_buffer_size: None,
             },
@@ -609,6 +610,7 @@ impl Router {
     ///             ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
     ///             announced_ip: Some("9.9.9.1".parse().unwrap()),
     ///             port: None,
+    ///             flags: None,
     ///             send_buffer_size: None,
     ///             recv_buffer_size: None,
     ///         },
@@ -696,6 +698,7 @@ impl Router {
     ///         ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
     ///         announced_ip: Some("9.9.9.1".parse().unwrap()),
     ///         port: None,
+    ///         flags: None,
     ///         send_buffer_size: None,
     ///         recv_buffer_size: None,
     ///     }))
@@ -761,6 +764,7 @@ impl Router {
     ///         ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
     ///         announced_ip: Some("9.9.9.1".parse().unwrap()),
     ///         port: None,
+    ///         flags: None,
     ///         send_buffer_size: None,
     ///         recv_buffer_size: None,
     ///     }))
@@ -971,6 +975,7 @@ impl Router {
     ///             ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
     ///             announced_ip: Some("9.9.9.1".parse().unwrap()),
     ///             port: None,
+    ///             flags: None,
     ///             send_buffer_size: None,
     ///             recv_buffer_size: None,
     ///         },
@@ -1013,6 +1018,7 @@ impl Router {
     ///             ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
     ///             announced_ip: Some("9.9.9.1".parse().unwrap()),
     ///             port: None,
+    ///             flags: None,
     ///             send_buffer_size: None,
     ///             recv_buffer_size: None,
     ///         },
@@ -1198,6 +1204,7 @@ impl Router {
     ///                 ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
     ///                 announced_ip: Some("9.9.9.1".parse().unwrap()),
     ///                 port: None,
+    ///                 flags: None,
     ///                 send_buffer_size: None,
     ///                 recv_buffer_size: None,
     ///             },
@@ -1229,6 +1236,7 @@ impl Router {
     ///                 ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
     ///                 announced_ip: Some("9.9.9.1".parse().unwrap()),
     ///                 port: None,
+    ///                 flags: None,
     ///                 send_buffer_size: None,
     ///                 recv_buffer_size: None,
     ///             },

diff --git a/rust/src/router/consumer/tests.rs b/rust/src/router/consumer/tests.rs
@@ -87,6 +87,7 @@ async fn init() -> (Router, WebRtcTransport, WebRtcTransport) {
             ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
             announced_ip: None,
             port: None,
+            flags: None,
             send_buffer_size: None,
             recv_buffer_size: None,
         }));

diff --git a/rust/src/router/data_consumer/tests.rs b/rust/src/router/data_consumer/tests.rs
@@ -41,6 +41,7 @@ async fn init() -> (Router, DataProducer) {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: None,
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 }));
@@ -74,6 +75,7 @@ fn data_producer_close_event() {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: None,
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 });
@@ -127,6 +129,7 @@ fn transport_close_event() {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: None,
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 });

diff --git a/rust/src/router/data_producer/tests.rs b/rust/src/router/data_producer/tests.rs
@@ -41,6 +41,7 @@ async fn init() -> (Router, WebRtcTransport) {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: None,
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 }));

diff --git a/rust/src/router/pipe_transport/tests.rs b/rust/src/router/pipe_transport/tests.rs
@@ -103,6 +103,7 @@ async fn init() -> (Router, Router, WebRtcTransport, WebRtcTransport) {
             ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
             announced_ip: None,
             port: None,
+            flags: None,
             send_buffer_size: None,
             recv_buffer_size: None,
         }));

diff --git a/rust/src/router/plain_transport/tests.rs b/rust/src/router/plain_transport/tests.rs
@@ -42,6 +42,7 @@ fn router_close_event() {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: Some("4.4.4.4".parse().unwrap()),
                     port: None,
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 });

diff --git a/rust/src/router/producer/tests.rs b/rust/src/router/producer/tests.rs
@@ -72,6 +72,7 @@ async fn init() -> (Router, WebRtcTransport) {
             ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
             announced_ip: None,
             port: None,
+            flags: None,
             send_buffer_size: None,
             recv_buffer_size: None,
         }));

diff --git a/rust/src/router/webrtc_transport/tests.rs b/rust/src/router/webrtc_transport/tests.rs
@@ -57,6 +57,7 @@ fn create_with_webrtc_server_succeeds() {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: Some(port1),
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 });
@@ -65,6 +66,7 @@ fn create_with_webrtc_server_succeeds() {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: Some(port2),
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 });
@@ -233,6 +235,7 @@ fn router_close_event() {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: Some("9.9.9.1".parse().unwrap()),
                     port: None,
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 }),
@@ -274,6 +277,7 @@ fn webrtc_server_close_event() {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: Some(port1),
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 });
@@ -282,6 +286,7 @@ fn webrtc_server_close_event() {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: Some(port2),
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 });

diff --git a/rust/src/webrtc_server/tests.rs b/rust/src/webrtc_server/tests.rs
@@ -38,6 +38,7 @@ fn worker_close_event() {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: Some(port),
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 },

diff --git a/rust/tests/integration/consumer.rs b/rust/tests/integration/consumer.rs
@@ -352,6 +352,7 @@ async fn init() -> (
             ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
             announced_ip: None,
             port: None,
+            flags: None,
             send_buffer_size: None,
             recv_buffer_size: None,
         }));

diff --git a/rust/tests/integration/data_consumer.rs b/rust/tests/integration/data_consumer.rs
@@ -68,6 +68,7 @@ async fn init() -> (Worker, Router, WebRtcTransport, DataProducer) {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: None,
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 }));
@@ -99,6 +100,7 @@ fn consume_data_succeeds() {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: None,
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 });
@@ -208,6 +210,7 @@ fn weak() {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: None,
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 });
@@ -572,6 +575,7 @@ fn close_event() {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: None,
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 });

diff --git a/rust/tests/integration/data_producer.rs b/rust/tests/integration/data_producer.rs
@@ -54,6 +54,7 @@ async fn init() -> (Worker, Router, WebRtcTransport, PlainTransport) {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: None,
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 }));
@@ -72,6 +73,7 @@ async fn init() -> (Worker, Router, WebRtcTransport, PlainTransport) {
                 ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                 announced_ip: None,
                 port: None,
+                flags: None,
                 send_buffer_size: None,
                 recv_buffer_size: None,
             });

diff --git a/rust/tests/integration/multiopus.rs b/rust/tests/integration/multiopus.rs
@@ -135,6 +135,7 @@ async fn init() -> (Router, WebRtcTransport) {
             ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
             announced_ip: None,
             port: None,
+            flags: None,
             send_buffer_size: None,
             recv_buffer_size: None,
         }));

diff --git a/rust/tests/integration/pipe_transport.rs b/rust/tests/integration/pipe_transport.rs
@@ -261,6 +261,7 @@ async fn init() -> (
             ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
             announced_ip: None,
             port: None,
+            flags: None,
             send_buffer_size: None,
             recv_buffer_size: None,
         }));
@@ -605,6 +606,7 @@ fn weak() {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: None,
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 });
@@ -639,6 +641,7 @@ fn create_with_fixed_port_succeeds() {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: Some(port),
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 })
@@ -662,6 +665,7 @@ fn create_with_enable_rtx_succeeds() {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: None,
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 });
@@ -774,6 +778,7 @@ fn create_with_enable_srtp_succeeds() {
                     ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                     announced_ip: None,
                     port: None,
+                    flags: None,
                     send_buffer_size: None,
                     recv_buffer_size: None,
                 });
@@ -829,6 +834,7 @@ fn create_with_invalid_srtp_parameters_fails() {
                 ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                 announced_ip: None,
                 port: None,
+                flags: None,
                 send_buffer_size: None,
                 recv_buffer_size: None,
             }))
@@ -1155,6 +1161,7 @@ fn pipe_to_router_called_twice_generates_single_pair() {
                 ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
                 announced_ip: None,
                 port: None,
+                flags: None,
                 send_buffer_size: None,
                 recv_buffer_size: None,
             }));