add illumos support (rustdesk#433)

IamTaoChen · Jun 29, 2024 · 041a603 · 041a603
1 parent e40994d
commit 041a603
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/libs/hbb_common/src/tcp.rs b/libs/hbb_common/src/tcp.rs
@@ -62,10 +62,11 @@ fn new_socket(addr: std::net::SocketAddr, reuse: bool) -> Result<TcpSocket, std:
         std::net::SocketAddr::V6(..) => TcpSocket::new_v6()?,
     };
     if reuse {
-        // windows has no reuse_port, but it's reuse_address
+        // windows has no reuse_port, but its reuse_address
         // almost equals to unix's reuse_port + reuse_address,
-        // though may introduce nondeterministic behavior
-        #[cfg(unix)]
+        // though may introduce nondeterministic behavior.
+        // illumos has no support for SO_REUSEPORT
+        #[cfg(all(unix, not(target_os = "illumos")))]
         socket.set_reuseport(true)?;
         socket.set_reuseaddr(true)?;
     }
@@ -263,10 +264,11 @@ pub async fn new_listener<T: ToSocketAddrs>(addr: T, reuse: bool) -> ResultType<
 pub async fn listen_any(port: u16, reuse: bool) -> ResultType<TcpListener> {
     if let Ok(mut socket) = TcpSocket::new_v6() {
         if reuse {
-            // windows has no reuse_port, but it's reuse_address
+            // windows has no reuse_port, but its reuse_address
             // almost equals to unix's reuse_port + reuse_address,
-            // though may introduce nondeterministic behavior
-            #[cfg(unix)]
+            // though may introduce nondeterministic behavior.
+            // illumos has no support for SO_REUSEPORT
+            #[cfg(all(unix, not(target_os = "illumos")))]
             socket.set_reuseport(true).ok();
             socket.set_reuseaddr(true).ok();
         }

diff --git a/libs/hbb_common/src/udp.rs b/libs/hbb_common/src/udp.rs
@@ -20,10 +20,11 @@ fn new_socket(addr: SocketAddr, reuse: bool, buf_size: usize) -> Result<Socket,
         SocketAddr::V6(..) => Socket::new(Domain::ipv6(), Type::dgram(), None),
     }?;
     if reuse {
-        // windows has no reuse_port, but it's reuse_address
+        // windows has no reuse_port, but its reuse_address
         // almost equals to unix's reuse_port + reuse_address,
-        // though may introduce nondeterministic behavior
-        #[cfg(unix)]
+        // though may introduce nondeterministic behavior.
+        // illumos has no support for SO_REUSEPORT
+        #[cfg(all(unix, not(target_os = "illumos")))]
         socket.set_reuse_port(true)?;
         socket.set_reuse_address(true)?;
     }