Add Windows automatic discovery support with WSDD

samba/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 12.7.0
+
+- Add Windows automatic discovery support with WSDD
+
 ## 12.6.1
 
 - Support spaces in configurable username

samba/Dockerfile

@@ -6,7 +6,7 @@ ENV LANG C.UTF-8
 
 # Setup base
 RUN \
-    apk add --no-cache samba \
+    apk add --no-cache samba wsdd \
     && mkdir -p /var/lib/samba \
     && touch \
         /etc/samba/lmhosts \

samba/config.yaml

@@ -1,5 +1,5 @@
 ---
-version: 12.6.1
+version: 12.7.0
 slug: samba
 name: Samba share
 description: Expose Home Assistant folders with SMB/CIFS

samba/rootfs/etc/s6-overlay/s6-rc.d/init-smbd/network-interfaces.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/with-contenv bash
+# vim: ft=bash
+# shellcheck shell=bash
+
+# Populate the provided array variable with enabled network interfaces.
+get_enabled_interfaces() {
+    local -n _out_interfaces=$1
+    local interface
+    local interface_enabled
+
+    _out_interfaces=()
+    for interface in $(bashio::network.interfaces); do
+        interface_enabled=$(bashio::network.enabled "${interface}")
+        if bashio::var.true "${interface_enabled}"; then
+            _out_interfaces+=("${interface}")
+        fi
+    done
+}

samba/rootfs/etc/s6-overlay/s6-rc.d/init-smbd/run

@@ -11,6 +11,9 @@ declare samba_username
 declare -a interfaces=()
 export HOSTNAME
 
+# shellcheck disable=SC1091  # Sourced from container filesystem path at runtime.
+source /etc/s6-overlay/s6-rc.d/init-smbd/network-interfaces.sh
+
 # Check Login data
 if ! bashio::config.has_value 'username' || ! bashio::config.has_value 'password'; then
     bashio::exit.nok "Setting a username and password is required!"
@@ -27,12 +30,7 @@ fi
 bashio::log.info "Hostname: ${HOSTNAME}"
 
 # Get supported interfaces
-for interface in $(bashio::network.interfaces); do
-    interface_enabled=$(bashio::network.enabled "${interface}")
-    if bashio::var.true "${interface_enabled}"; then
-        interfaces+=("${interface}")
-    fi
-done
+get_enabled_interfaces interfaces
 if [ ${#interfaces[@]} -eq 0 ]; then
     bashio::exit.nok 'No supported interfaces found to bind on.'
 fi

samba/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/wsdd

@@ -0,0 +1 @@
+

samba/rootfs/etc/s6-overlay/s6-rc.d/wsdd/dependencies.d/init-smbd

@@ -0,0 +1 @@
+

samba/rootfs/etc/s6-overlay/s6-rc.d/wsdd/finish

@@ -0,0 +1,29 @@
+#!/command/with-contenv bashio
+# vim: ft=bash
+# shellcheck shell=bash
+# ==============================================================================
+# Keep the addon running when the optional wsdd service fails
+# ==============================================================================
+
+# shellcheck disable=SC2155
+readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
+readonly exit_code_service="${1}"
+readonly exit_code_signal="${2}"
+readonly service="wsdd"
+
+bashio::log.info \
+  "Service ${service} exited with code ${exit_code_service}" \
+  "(by signal ${exit_code_signal})"
+
+if [[ "${exit_code_service}" -eq 256 && "${exit_code_signal}" -eq 15 ]]; then
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo $((128 + exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
+  fi
+  exec /run/s6/basedir/bin/halt
+elif [[ "${exit_code_service}" -eq 256 ]]; then
+  bashio::log.warning \
+    "Optional service ${service} exited by signal ${exit_code_signal}; continuing without Windows discovery."
+elif [[ "${exit_code_service}" -ne 0 ]]; then
+  bashio::log.warning \
+    "Optional service ${service} failed; continuing without Windows discovery."
+fi

samba/rootfs/etc/s6-overlay/s6-rc.d/wsdd/run

@@ -0,0 +1,39 @@
+#!/command/with-contenv bashio
+# vim: ft=bash
+# shellcheck shell=bash
+# ==============================================================================
+# Start wsdd service
+# ==============================================================================
+declare hostname
+declare workgroup
+declare -a wsdd_interfaces=()
+declare -a interfaces=()
+
+# shellcheck disable=SC1091  # Sourced from container filesystem path at runtime.
+source /etc/s6-overlay/s6-rc.d/init-smbd/network-interfaces.sh
+
+# Match Samba's advertised server name.
+hostname=$(bashio::info.hostname)
+if bashio::var.is_empty "${hostname}"; then
+    bashio::log.warning "Can't read hostname, using default."
+    hostname="hassio"
+fi
+workgroup=$(bashio::config 'workgroup')
+
+get_enabled_interfaces interfaces
+
+if [ ${#interfaces[@]} -eq 0 ]; then
+    bashio::log.warning 'WSDD disabled: no supported interfaces found to bind on.'
+    exec tail -f /dev/null
+fi
+
+# wsdd expects each interface to be preceded by "-i".
+for interface in "${interfaces[@]}"; do
+    wsdd_interfaces+=("-i" "${interface}")
+done
+
+bashio::log.info \
+    "Starting the WSDD daemon on interfaces: $(printf '%s ' "${interfaces[@]}")" \
+    "for ${workgroup}/${hostname}"
+
+exec wsdd "${wsdd_interfaces[@]}" -n "${hostname}" -w "${workgroup}"

samba/rootfs/etc/s6-overlay/s6-rc.d/wsdd/type

@@ -0,0 +1 @@
+longrun