Use actual interface to check available ports (#2789)

Author: dalance

components/site/src/lib.rs

@@ -7,6 +7,7 @@ pub mod tpls;
 
 use std::borrow::Cow;
 use std::collections::{HashMap, HashSet};
+use std::net::IpAddr;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex, RwLock};
 
@@ -149,8 +150,8 @@ impl Site {
     /// We avoid the port the server is going to use as it's not bound yet
     /// when calling this function and we could end up having tried to bind
     /// both http and websocket server to the same port
-    pub fn enable_live_reload(&mut self, port_to_avoid: u16) {
-        self.live_reload = get_available_port(port_to_avoid);
+    pub fn enable_live_reload(&mut self, interface: IpAddr, port_to_avoid: u16) {
+        self.live_reload = get_available_port(interface, port_to_avoid);
     }
 
     /// Only used in `zola serve` to re-use the initial websocket port

components/site/tests/site.rs

@@ -237,7 +237,9 @@ fn can_build_site_without_live_reload() {
 #[test]
 fn can_build_site_with_live_reload_and_drafts() {
     let (site, _tmp_dir, public) = build_site_with_setup("test_site", |mut site| {
-        site.enable_live_reload(1000);
+        use std::net::IpAddr;
+        use std::str::FromStr;
+        site.enable_live_reload(IpAddr::from_str("127.0.0.1").unwrap(), 1000);
         site.include_drafts();
         (site, true)
     });

components/utils/src/net.rs

@@ -1,13 +1,14 @@
+use std::net::IpAddr;
 use std::net::TcpListener;
 
-pub fn get_available_port(avoid: u16) -> Option<u16> {
+pub fn get_available_port(interface: IpAddr, avoid: u16) -> Option<u16> {
     // Start after "well-known" ports (0–1023) as they require superuser
     // privileges on UNIX-like operating systems.
-    (1024..9000).find(|port| *port != avoid && port_is_available(*port))
+    (1024..9000).find(|port| *port != avoid && port_is_available(interface, *port))
 }
 
-pub fn port_is_available(port: u16) -> bool {
-    TcpListener::bind(("127.0.0.1", port)).is_ok()
+pub fn port_is_available(interface: IpAddr, port: u16) -> bool {
+    TcpListener::bind((interface, port)).is_ok()
 }
 
 /// Returns whether a link starts with an HTTP(s) scheme.

src/cmd/serve.rs

@@ -409,7 +409,7 @@ fn create_new_site(
     if let Some(p) = ws_port {
         site.enable_live_reload_with_port(p);
     } else {
-        site.enable_live_reload(interface_port);
+        site.enable_live_reload(interface, interface_port);
     }
     messages::notify_site_size(&site);
     messages::warn_about_ignored_pages(&site);

src/main.rs

@@ -90,13 +90,13 @@ fn main() {
             no_port_append,
             extra_watch_path,
         } => {
-            if port != 1111 && !port_is_available(port) {
+            if port != 1111 && !port_is_available(interface, port) {
                 console::error("The requested port is not available");
                 std::process::exit(1);
             }
 
-            if !port_is_available(port) {
-                port = get_available_port(1111).unwrap_or_else(|| {
+            if !port_is_available(interface, port) {
+                port = get_available_port(interface, 1111).unwrap_or_else(|| {
                     console::error("No port available");
                     std::process::exit(1);
                 });