From 7da1dc5461ac54fab3e69b81035d03042ed2e458 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 16 Nov 2021 00:20:13 +0100 Subject: [PATCH] Apply 'shfmt -bn -i 4 -w' on ynh-hotspot --- conf/ynh-hotspot | 581 +++++++++++++++++++++++------------------------ 1 file changed, 289 insertions(+), 292 deletions(-) diff --git a/conf/ynh-hotspot b/conf/ynh-hotspot index 8139c0a..18e498d 100644 --- a/conf/ynh-hotspot +++ b/conf/ynh-hotspot @@ -21,232 +21,232 @@ ## State functions has_vpnclient_app() { - [ -e /tmp/.ynh-vpnclient-started ] + [ -e /tmp/.ynh-vpnclient-started ] } has_ip6delegatedprefix() { - local i=${1} + local i=${1} - [[ -n "${ip6_net[${i}]}" ]] && [[ "${ip6_net[${i}]}" != "none" ]] + [[ -n "${ip6_net[${i}]}" ]] && [[ "${ip6_net[${i}]}" != "none" ]] } ip6addrfromdelegatedprefix() { - local i=${1} + local i=${1} - echo "${ip6_net[${i}]}${i}001" + echo "${ip6_net[${i}]}${i}001" } is_nat_set() { - local gateway_interface=${1} + local gateway_interface=${1} - iptables -w -nvt nat -L POSTROUTING | grep MASQUERADE | grep -q "${gateway_interface}" + iptables -w -nvt nat -L POSTROUTING | grep MASQUERADE | grep -q "${gateway_interface}" } is_ip4nataddr_set() { - local i=${1} - dev=$(devfromid "${i}") + local i=${1} + dev=$(devfromid "${i}") - ip address show dev "${dev}" 2> /dev/null | grep -q "${ip4_nat_prefix[${i}]}.1/24" + ip address show dev "${dev}" 2>/dev/null | grep -q "${ip4_nat_prefix[${i}]}.1/24" } is_ip6addr_set() { - local i=${1} - dev=$(devfromid "${i}") + local i=${1} + dev=$(devfromid "${i}") - ip address show dev "${dev}" 2> /dev/null | grep -q "$(ip6addrfromdelegatedprefix $i)/64" + ip address show dev "${dev}" 2>/dev/null | grep -q "$(ip6addrfromdelegatedprefix $i)/64" } is_ip6firewall_set() { - local i=${1} - dev=$(devfromid "${i}") + local i=${1} + dev=$(devfromid "${i}") - ip6tables -w -nvL FORWARD | grep DROP | grep -q "${dev}" + ip6tables -w -nvL FORWARD | grep DROP | grep -q "${dev}" } is_forwarding_set() { - local ip6=$(sysctl net.ipv6.conf.all.forwarding | awk '{ print $NF; }') - local ip4=$(sysctl net.ipv4.conf.all.forwarding | awk '{ print $NF; }') + local ip6=$(sysctl net.ipv6.conf.all.forwarding | awk '{ print $NF; }') + local ip4=$(sysctl net.ipv4.conf.all.forwarding | awk '{ print $NF; }') - [ "${ip6}" -eq 1 -a "${ip4}" -eq 1 ] + [ "${ip6}" -eq 1 -a "${ip4}" -eq 1 ] } is_dhcpd6_running() { - local i=${1} + local i=${1} - $(ps aux | grep "dhcpdv6-ssid${i}" | grep -qv grep) + $(ps aux | grep "dhcpdv6-ssid${i}" | grep -qv grep) } is_dhcpd4_running() { - local i=${1} + local i=${1} - $(ps aux | grep "dhcpdv4-ssid${i}" | grep -qv grep) + $(ps aux | grep "dhcpdv4-ssid${i}" | grep -qv grep) } is_hostapd_running() { - systemctl is-active hostapd &> /dev/null + systemctl is-active hostapd &>/dev/null } is_running() { - for i in $(seq 0 $((${multissid} - 1))); do - ( has_ip6delegatedprefix ${i} && is_ip6addr_set ${i}\ - && ( [ "${ip6_firewall[${i}]}" -eq 1 ] && is_ip6firewall_set ${i} || [ "${ip6_firewall[${i}]}" -eq 0 ] )\ - && is_dhcpd6_running ${i} || ! has_ip6delegatedprefix ${i} )\ - && is_ip4nataddr_set ${i} && is_dhcpd4_running ${i} + for i in $(seq 0 $((${multissid} - 1))); do + (has_ip6delegatedprefix ${i} && is_ip6addr_set ${i} \ + && ([ "${ip6_firewall[${i}]}" -eq 1 ] && is_ip6firewall_set ${i} || [ "${ip6_firewall[${i}]}" -eq 0 ]) \ + && is_dhcpd6_running ${i} || ! has_ip6delegatedprefix ${i}) \ + && is_ip4nataddr_set ${i} && is_dhcpd4_running ${i} - if [ ! $? -eq 0 ]; then - return 1 - fi - done + if [ ! $? -eq 0 ]; then + return 1 + fi + done - is_hostapd_running && is_forwarding_set && ( [ -z "${new_gateway_interface}" ] || is_nat_set "${new_gateway_interface}" ) + is_hostapd_running && is_forwarding_set && ([ -z "${new_gateway_interface}" ] || is_nat_set "${new_gateway_interface}") } ## Setters set_nat() { - local gateway_interface=${1} + local gateway_interface=${1} - iptables -w -t nat -A POSTROUTING -o "${gateway_interface}" -j MASQUERADE + iptables -w -t nat -A POSTROUTING -o "${gateway_interface}" -j MASQUERADE } set_ip4nataddr() { - local i=${1} - local dev=$(devfromid "${i}") + local i=${1} + local dev=$(devfromid "${i}") - ip address add "${ip4_nat_prefix[${i}]}.1/24" dev "${dev}" + ip address add "${ip4_nat_prefix[${i}]}.1/24" dev "${dev}" } set_ip6addr() { - local i=${1} - local dev=$(devfromid "${i}") + local i=${1} + local dev=$(devfromid "${i}") - ip address delete "$(ip6addrfromdelegatedprefix $i)/64" dev tun0 &> /dev/null - ip address add "$(ip6addrfromdelegatedprefix $i)/64" dev "${dev}" + ip address delete "$(ip6addrfromdelegatedprefix $i)/64" dev tun0 &>/dev/null + ip address add "$(ip6addrfromdelegatedprefix $i)/64" dev "${dev}" } set_ip6firewall() { - local i=${1} - local dev=$(devfromid "${i}") + local i=${1} + local dev=$(devfromid "${i}") - ip6tables -w -A FORWARD -i "${dev}" -j ACCEPT - ip6tables -w -A FORWARD -o "${dev}" -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT - ip6tables -w -A FORWARD -o "${dev}" -j DROP + ip6tables -w -A FORWARD -i "${dev}" -j ACCEPT + ip6tables -w -A FORWARD -o "${dev}" -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT + ip6tables -w -A FORWARD -o "${dev}" -j DROP } set_forwarding() { - sysctl -w net.ipv6.conf.all.forwarding=1 > /dev/null - sysctl -w net.ipv4.conf.all.forwarding=1 > /dev/null + sysctl -w net.ipv6.conf.all.forwarding=1 >/dev/null + sysctl -w net.ipv4.conf.all.forwarding=1 >/dev/null } start_dhcpd6() { - local i=${1} - local dev=$(devfromid "${i}") + local i=${1} + local dev=$(devfromid "${i}") - cp /etc/dnsmasq.dhcpd/dhcpdv6{.conf.tpl,-ssid${i}.conf} + cp /etc/dnsmasq.dhcpd/dhcpdv6{.conf.tpl,-ssid${i}.conf} - sed "s|__WIFI_DEVICE__|${dev}|g" -i /etc/dnsmasq.dhcpd/dhcpdv6-ssid${i}.conf - sed "s|__IP6_NET__|${ip6_net[${i}]}|g" -i /etc/dnsmasq.dhcpd/dhcpdv6-ssid${i}.conf - sed "s|__IP6_DNS__|${ip6_dns[${i}]}|g" -i /etc/dnsmasq.dhcpd/dhcpdv6-ssid${i}.conf + sed "s|__WIFI_DEVICE__|${dev}|g" -i /etc/dnsmasq.dhcpd/dhcpdv6-ssid${i}.conf + sed "s|__IP6_NET__|${ip6_net[${i}]}|g" -i /etc/dnsmasq.dhcpd/dhcpdv6-ssid${i}.conf + sed "s|__IP6_DNS__|${ip6_dns[${i}]}|g" -i /etc/dnsmasq.dhcpd/dhcpdv6-ssid${i}.conf - dnsmasq -C /etc/dnsmasq.dhcpd/dhcpdv6-ssid${i}.conf -p0 + dnsmasq -C /etc/dnsmasq.dhcpd/dhcpdv6-ssid${i}.conf -p0 } start_dhcpd4() { - local i=${1} - local dev=$(devfromid "${i}") + local i=${1} + local dev=$(devfromid "${i}") - cp /etc/dnsmasq.dhcpd/dhcpdv4{.conf.tpl,-ssid${i}.conf} + cp /etc/dnsmasq.dhcpd/dhcpdv4{.conf.tpl,-ssid${i}.conf} - sed "s|__IP4_DNS__|${ip4_dns[${i}]}|g" -i /etc/dnsmasq.dhcpd/dhcpdv4-ssid${i}.conf - sed "s|__WIFI_DEVICE__|${dev}|g" -i /etc/dnsmasq.dhcpd/dhcpdv4-ssid${i}.conf - sed "s|__IP4_NAT_PREFIX__|${ip4_nat_prefix[${i}]}|g" -i /etc/dnsmasq.dhcpd/dhcpdv4-ssid${i}.conf + sed "s|__IP4_DNS__|${ip4_dns[${i}]}|g" -i /etc/dnsmasq.dhcpd/dhcpdv4-ssid${i}.conf + sed "s|__WIFI_DEVICE__|${dev}|g" -i /etc/dnsmasq.dhcpd/dhcpdv4-ssid${i}.conf + sed "s|__IP4_NAT_PREFIX__|${ip4_nat_prefix[${i}]}|g" -i /etc/dnsmasq.dhcpd/dhcpdv4-ssid${i}.conf - dnsmasq -C /etc/dnsmasq.dhcpd/dhcpdv4-ssid${i}.conf -p0 + dnsmasq -C /etc/dnsmasq.dhcpd/dhcpdv4-ssid${i}.conf -p0 } configure_hostapd() { - local ethaddr=$(ip link show dev "${wifi_device}" | grep link/ether | awk -F: '{ printf "02:%s:%s:%s:%s:00", $2, $3, $4, $5 }') - ip link set addr "${ethaddr}" dev "${wifi_device}" + local ethaddr=$(ip link show dev "${wifi_device}" | grep link/ether | awk -F: '{ printf "02:%s:%s:%s:%s:00", $2, $3, $4, $5 }') + ip link set addr "${ethaddr}" dev "${wifi_device}" - cp /etc/hostapd/hostapd.base.conf /etc/hostapd/hostapd.conf - sed "s|__WIFI_DEVICE__|${wifi_device}|g" -i /etc/hostapd/hostapd.conf - sed "s|__WIFI_CHANNEL__|${wifi_channel}|g" -i /etc/hostapd/hostapd.conf - sed "s|__N_COMMENT__||g" -i /etc/hostapd/hostapd.conf + cp /etc/hostapd/hostapd.base.conf /etc/hostapd/hostapd.conf + sed "s|__WIFI_DEVICE__|${wifi_device}|g" -i /etc/hostapd/hostapd.conf + sed "s|__WIFI_CHANNEL__|${wifi_channel}|g" -i /etc/hostapd/hostapd.conf + sed "s|__N_COMMENT__||g" -i /etc/hostapd/hostapd.conf - for i in $(seq 0 $((${multissid} - 1))); do + for i in $(seq 0 $((${multissid} - 1))); do - [ "${wifi_secure[${i}]}" -eq 1 ] && local sec_comment="" || local sec_comment="#" - [ "${i}" -eq 0 ] && local bss_comment="#" || local bss_comment="" + [ "${wifi_secure[${i}]}" -eq 1 ] && local sec_comment="" || local sec_comment="#" + [ "${i}" -eq 0 ] && local bss_comment="#" || local bss_comment="" - cp /etc/hostapd/hostapd.accesspoint.conf /etc/hostapd/hostapd.conf.tmp + cp /etc/hostapd/hostapd.accesspoint.conf /etc/hostapd/hostapd.conf.tmp - sed "s|__WIFI_INTERFACE__|hotspot${i}|g" -i /etc/hostapd/hostapd.conf.tmp - sed "s|__WIFI_SSID__|${wifi_ssid[${i}]}|g" -i /etc/hostapd/hostapd.conf.tmp - sed "s|__WIFI_PASSPHRASE__|${wifi_passphrase[${i}]}|g" -i /etc/hostapd/hostapd.conf.tmp - sed "s|__SEC_COMMENT__|${sec_comment}|g" -i /etc/hostapd/hostapd.conf.tmp - sed "s|__BSS_COMMENT__|${bss_comment}|g" -i /etc/hostapd/hostapd.conf.tmp + sed "s|__WIFI_INTERFACE__|hotspot${i}|g" -i /etc/hostapd/hostapd.conf.tmp + sed "s|__WIFI_SSID__|${wifi_ssid[${i}]}|g" -i /etc/hostapd/hostapd.conf.tmp + sed "s|__WIFI_PASSPHRASE__|${wifi_passphrase[${i}]}|g" -i /etc/hostapd/hostapd.conf.tmp + sed "s|__SEC_COMMENT__|${sec_comment}|g" -i /etc/hostapd/hostapd.conf.tmp + sed "s|__BSS_COMMENT__|${bss_comment}|g" -i /etc/hostapd/hostapd.conf.tmp - cat /etc/hostapd/hostapd.conf.tmp >> /etc/hostapd/hostapd.conf - rm /etc/hostapd/hostapd.conf.tmp - done + cat /etc/hostapd/hostapd.conf.tmp >>/etc/hostapd/hostapd.conf + rm /etc/hostapd/hostapd.conf.tmp + done } ## Unsetters unset_nat() { - local gateway_interface=${1} + local gateway_interface=${1} - iptables -w -t nat -D POSTROUTING -o "${gateway_interface}" -j MASQUERADE + iptables -w -t nat -D POSTROUTING -o "${gateway_interface}" -j MASQUERADE } unset_ip4nataddr() { - local i=${1} - local dev=$(devfromid "${i}") + local i=${1} + local dev=$(devfromid "${i}") - ip address delete "${ip4_nat_prefix[${i}]}.1/24" dev "${dev}" + ip address delete "${ip4_nat_prefix[${i}]}.1/24" dev "${dev}" } unset_ip6addr() { - local i=${1} - local dev=$(devfromid "${i}") + local i=${1} + local dev=$(devfromid "${i}") - ip address delete "$(ip6addrfromdelegatedprefix $i)/64" dev "${dev}" + ip address delete "$(ip6addrfromdelegatedprefix $i)/64" dev "${dev}" } unset_ip6firewall() { - local i=${1} - local dev=$(devfromid "${i}") + local i=${1} + local dev=$(devfromid "${i}") - ip6tables -w -D FORWARD -i "${dev}" -j ACCEPT - ip6tables -w -D FORWARD -o "${dev}" -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT - ip6tables -w -D FORWARD -o "${dev}" -j DROP + ip6tables -w -D FORWARD -i "${dev}" -j ACCEPT + ip6tables -w -D FORWARD -o "${dev}" -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT + ip6tables -w -D FORWARD -o "${dev}" -j DROP } unset_forwarding() { - sysctl -w net.ipv6.conf.all.forwarding=0 > /dev/null - sysctl -w net.ipv4.conf.all.forwarding=0 > /dev/null + sysctl -w net.ipv6.conf.all.forwarding=0 >/dev/null + sysctl -w net.ipv4.conf.all.forwarding=0 >/dev/null } stop_dhcpd6() { - kill $(ps aux | grep 'dhcpdv6-ssid' | grep -v grep | awk '{ print $2 }') - rm -f /etc/dnsmasq.d/dhcpdv6-ssid*.conf + kill $(ps aux | grep 'dhcpdv6-ssid' | grep -v grep | awk '{ print $2 }') + rm -f /etc/dnsmasq.d/dhcpdv6-ssid*.conf } stop_dhcpd4() { - kill $(ps aux | grep 'dhcpdv4-ssid' | grep -v grep | awk '{ print $2 }') - rm -f /etc/dnsmasq.d/dhcpdv4-ssid*.conf + kill $(ps aux | grep 'dhcpdv4-ssid' | grep -v grep | awk '{ print $2 }') + rm -f /etc/dnsmasq.d/dhcpdv4-ssid*.conf } stop_hostapd() { - systemctl stop hostapd + systemctl stop hostapd } ## Tools ynh_setting_get() { - APP="$1" KEY="$2" python3 - < /dev/null - if [ "$?" -eq 0 ]; then - new_gateway_interface=tun0 - fi + # Switch the NAT interface if there is a VPN + ip link show dev tun0 &>/dev/null + if [ "$?" -eq 0 ]; then + new_gateway_interface=tun0 + fi - echo "OK" + echo "OK" fi # Script case "$1" in - start) +start) if is_running; then - echo "Already started" - exit 0 + echo "Already started" + exit 0 elif [ "${service_enabled}" != "enabled" ]; then - echo "Not starting because hotspod service is disabled" - exit 1 + echo "Not starting because hotspod service is disabled" + exit 1 fi if [ -z "${wifi_device}" ]; then - echo "[FAIL] No wifi device selected. Make sure your wifi antenna is plugged-in / available and select it in the Hotspot admin" - exit 1 + echo "[FAIL] No wifi device selected. Make sure your wifi antenna is plugged-in / available and select it in the Hotspot admin" + exit 1 fi echo "[hotspot] Starting..." touch /tmp/.ynh-hotspot-started # Check old state of the ipv4 NAT settings - if [ ! -z "${old_gateway_interface}" -a "${new_gateway_interface}" != "${old_gateway_interface}" ]\ - && is_nat_set "${old_gateway_interface}"; then + if [ ! -z "${old_gateway_interface}" -a "${new_gateway_interface}" != "${old_gateway_interface}" ] && is_nat_set "${old_gateway_interface}"; then - unset_nat "${old_gateway_interface}" + unset_nat "${old_gateway_interface}" fi # Set ipv4 NAT if [ ! -z "${new_gateway_interface}" ] && ! is_nat_set "${new_gateway_interface}"; then - echo "Set NAT" - set_nat "${new_gateway_interface}" + echo "Set NAT" + set_nat "${new_gateway_interface}" fi # Set forwarding for ipv6 and ipv4 if ! is_forwarding_set; then - echo "Set forwarding" - set_forwarding + echo "Set forwarding" + set_forwarding fi # Run hostapd if ! is_hostapd_running; then - echo "Configuring hostapd" - configure_hostapd + echo "Configuring hostapd" + configure_hostapd - echo "Starting hostapd..." - if ! systemctl start hostapd - journalctl -u hostapd -n 100 --no-hostname --no-pager - exit 1 - fi - - sleep 1 - - i=0; - while ! ip link show dev hotspot1 &> /dev/null; do - sleep 1 - if [ ${i} -gt 20 ] - then - echo "Failed to see hotspot interface showing up in 'ip a'" - stop_hostapd - exit 1 + echo "Starting hostapd..." + if ! systemctl start hostapd; then + journalctl -u hostapd -n 100 --no-hostname --no-pager + exit 1 fi - i=$(($i + 1)) - done + + sleep 1 + + i=0 + while ! ip link show dev hotspot1 &>/dev/null; do + sleep 1 + if [ ${i} -gt 20 ]; then + echo "Failed to see hotspot interface showing up in 'ip a'" + stop_hostapd + exit 1 + fi + i=$(($i + 1)) + done fi # For each registred ssid for i in $(seq 0 $((${multissid} - 1))); do - # Set ipv4 NAT address - if ! is_ip4nataddr_set ${i}; then - echo "hotspot${i}: Set IPv4 NAT address" - set_ip4nataddr ${i} - fi + # Set ipv4 NAT address + if ! is_ip4nataddr_set ${i}; then + echo "hotspot${i}: Set IPv4 NAT address" + set_ip4nataddr ${i} + fi - # Set the ipv6 address - if has_ip6delegatedprefix ${i} && ! is_ip6addr_set ${i}; then - echo "hotspot${i}: Set IPv6 address" - set_ip6addr ${i} - fi + # Set the ipv6 address + if has_ip6delegatedprefix ${i} && ! is_ip6addr_set ${i}; then + echo "hotspot${i}: Set IPv6 address" + set_ip6addr ${i} + fi - # Set ipv6 firewalling - if has_ip6delegatedprefix ${i} && [ "${ip6_firewall[${i}]}" -eq 1 ] && ! is_ip6firewall_set ${i}; then - echo "hotspot${i}: Set IPv6 firewalling" - set_ip6firewall ${i} - fi + # Set ipv6 firewalling + if has_ip6delegatedprefix ${i} && [ "${ip6_firewall[${i}]}" -eq 1 ] && ! is_ip6firewall_set ${i}; then + echo "hotspot${i}: Set IPv6 firewalling" + set_ip6firewall ${i} + fi - # Run DHCPv6 server - if has_ip6delegatedprefix ${i} && ! is_dhcpd6_running ${i}; then - echo "hotspot${i}: Start the NDP and DHCPv6 server (dnsmasq)" - start_dhcpd6 ${i} - fi + # Run DHCPv6 server + if has_ip6delegatedprefix ${i} && ! is_dhcpd6_running ${i}; then + echo "hotspot${i}: Start the NDP and DHCPv6 server (dnsmasq)" + start_dhcpd6 ${i} + fi - # Run DHCPv4 server - if ! is_dhcpd4_running ${i}; then - echo "hotspot${i}: Start the DHCPv4 server (dnsmasq)" - start_dhcpd4 ${i} - fi + # Run DHCPv4 server + if ! is_dhcpd4_running ${i}; then + echo "hotspot${i}: Start the DHCPv4 server (dnsmasq)" + start_dhcpd4 ${i} + fi done # Update dynamic settings ynh_setting_set hotspot gateway_interface "${new_gateway_interface}" - ;; - stop) + ;; +stop) echo "[hotspot] Stopping..." rm -f /tmp/.ynh-hotspot-started if [ ! -z "${old_gateway_interface}" ] && is_nat_set "${old_gateway_interface}"; then - echo "Unset NAT" - unset_nat "${old_gateway_interface}" + echo "Unset NAT" + unset_nat "${old_gateway_interface}" fi if is_forwarding_set; then - echo "Unset forwarding" - unset_forwarding + echo "Unset forwarding" + unset_forwarding fi for i in $(seq 0 $((${multissid} - 1))); do - if is_ip4nataddr_set ${i}; then - echo "hotspot${i}: Unset IPv4 NAT address" - unset_ip4nataddr ${i} - fi + if is_ip4nataddr_set ${i}; then + echo "hotspot${i}: Unset IPv4 NAT address" + unset_ip4nataddr ${i} + fi - if has_ip6delegatedprefix ${i} && is_ip6addr_set ${i}; then - echo "hotspot${i}: Unset IPv6 address" - unset_ip6addr ${i} - fi + if has_ip6delegatedprefix ${i} && is_ip6addr_set ${i}; then + echo "hotspot${i}: Unset IPv6 address" + unset_ip6addr ${i} + fi - if has_ip6delegatedprefix ${i} && [ "${ip6_firewall[${i}]}" -eq 1 ] && is_ip6firewall_set ${i}; then - echo "hotspot${i}: Unset IPv6 firewalling" - unset_ip6firewall ${i} - fi + if has_ip6delegatedprefix ${i} && [ "${ip6_firewall[${i}]}" -eq 1 ] && is_ip6firewall_set ${i}; then + echo "hotspot${i}: Unset IPv6 firewalling" + unset_ip6firewall ${i} + fi - if is_dhcpd6_running ${i}; then - echo "hotspot${i}: Stop the NDP and DHCPv6 server (dnsmasq)" - stop_dhcpd6 ${i} - fi + if is_dhcpd6_running ${i}; then + echo "hotspot${i}: Stop the NDP and DHCPv6 server (dnsmasq)" + stop_dhcpd6 ${i} + fi - if is_dhcpd4_running ${i}; then - echo "hotspot${i}: Stop the DHCPv4 server (dnsmasq)" - stop_dhcpd4 ${i} - fi + if is_dhcpd4_running ${i}; then + echo "hotspot${i}: Stop the DHCPv4 server (dnsmasq)" + stop_dhcpd4 ${i} + fi done if is_hostapd_running; then - echo "Stop hostapd" - stop_hostapd + echo "Stop hostapd" + stop_hostapd fi # Fix configuration if has_vpnclient_app; then - ynh-vpnclient start + ynh-vpnclient start fi - ;; - restart) + ;; +restart) $0 stop $0 start - ;; - status) + ;; +status) exitcode=0 if [ "${service_enabled}" != "enabled" ]; then - echo "[FAIL] Hotspot Service disabled" - exit 1 + echo "[FAIL] Hotspot Service disabled" + exit 1 fi if [ -z "${wifi_device}" ]; then - echo "[FAIL] No wifi device selected. Make sure your wifi antenna is plugged-in / available and select it in the Hotspot admin" - exit 1 + echo "[FAIL] No wifi device selected. Make sure your wifi antenna is plugged-in / available and select it in the Hotspot admin" + exit 1 fi echo "[INFO] Autodetected internet interface: ${new_gateway_interface} (last start: ${old_gateway_interface})" if is_nat_set "${new_gateway_interface}"; then - echo "[ OK ] IPv4 NAT set" + echo "[ OK ] IPv4 NAT set" else - if [ -z "${new_gateway_interface}" ]; then - echo "[INFO] No IPv4 NAT set (no internet interface)" - else - echo "[FAIL] No IPv4 NAT set" - fi - exitcode=1 + if [ -z "${new_gateway_interface}" ]; then + echo "[INFO] No IPv4 NAT set (no internet interface)" + else + echo "[FAIL] No IPv4 NAT set" + fi + exitcode=1 fi if is_forwarding_set; then - echo "[ OK ] IPv6/IPv4 forwarding set" + echo "[ OK ] IPv6/IPv4 forwarding set" else - echo "[FAIL] No IPv6/IPv4 forwarding set" - exitcode=1 + echo "[FAIL] No IPv6/IPv4 forwarding set" + exitcode=1 fi if is_hostapd_running; then - echo "[ OK ] Hostapd is running" + echo "[ OK ] Hostapd is running" else - echo "[FAIL] Hostapd is not running" - exitcode=1 + echo "[FAIL] Hostapd is not running" + exitcode=1 fi for i in $(seq 0 $((${multissid} - 1))); do - if has_ip6delegatedprefix ${i}; then - echo "[INFO] hotspot${i}: IPv6 delegated prefix found" - echo "[INFO] hotspot${i}: IPv6 address computed from the delegated prefix: $(ip6addrfromdelegatedprefix $i)" + if has_ip6delegatedprefix ${i}; then + echo "[INFO] hotspot${i}: IPv6 delegated prefix found" + echo "[INFO] hotspot${i}: IPv6 address computed from the delegated prefix: $(ip6addrfromdelegatedprefix $i)" - if is_ip6addr_set ${i}; then - echo "[ OK ] hotspot${i}: IPv6 address set" + if is_ip6addr_set ${i}; then + echo "[ OK ] hotspot${i}: IPv6 address set" + else + echo "[FAIL] hotspot${i}: No IPv6 address set" + exitcode=1 + fi + + if is_ip6firewall_set ${i}; then + echo "[ OK ] hotspot${i}: IPv6 firewalling set" + else + if [ "${ip6_firewall[${i}]}" -eq 1 ]; then + echo "[FAIL] hotspot${i}: No IPv6 firewalling set" + else + echo "[INFO] hotspot${i}: No IPv6 firewalling set" + fi + exitcode=1 + fi + + if is_dhcpd6_running ${i}; then + echo "[ OK ] hotspot${i}: NDP and DHCPv6 server (dnsmasq) are running" + else + echo "[FAIL] hotspot${i}: NDP and DHCPv6 server (dnsmasq) are not running" + exitcode=1 + fi else - echo "[FAIL] hotspot${i}: No IPv6 address set" - exitcode=1 + echo "[INFO] hotspot${i}: No IPv6 delegated prefix found" fi - if is_ip6firewall_set ${i}; then - echo "[ OK ] hotspot${i}: IPv6 firewalling set" + if is_dhcpd4_running ${i}; then + echo "[ OK ] hotspot${i}: DHCPv4 server (dnsmasq) is running" else - if [ "${ip6_firewall[${i}]}" -eq 1 ]; then - echo "[FAIL] hotspot${i}: No IPv6 firewalling set" - else - echo "[INFO] hotspot${i}: No IPv6 firewalling set" - fi - exitcode=1 + echo "[FAIL] hotspot${i}: DHCPv4 (dnsmasq) is not running" + exitcode=1 fi - if is_dhcpd6_running ${i}; then - echo "[ OK ] hotspot${i}: NDP and DHCPv6 server (dnsmasq) are running" + if is_ip4nataddr_set ${i}; then + echo "[ OK ] hotspot${i}: IPv4 NAT address set" else - echo "[FAIL] hotspot${i}: NDP and DHCPv6 server (dnsmasq) are not running" - exitcode=1 + echo "[FAIL] hotspot${i}: No IPv4 NAT address set" + exitcode=1 fi - else - echo "[INFO] hotspot${i}: No IPv6 delegated prefix found" - fi - - if is_dhcpd4_running ${i}; then - echo "[ OK ] hotspot${i}: DHCPv4 server (dnsmasq) is running" - else - echo "[FAIL] hotspot${i}: DHCPv4 (dnsmasq) is not running" - exitcode=1 - fi - - if is_ip4nataddr_set ${i}; then - echo "[ OK ] hotspot${i}: IPv4 NAT address set" - else - echo "[FAIL] hotspot${i}: No IPv4 NAT address set" - exitcode=1 - fi done exit ${exitcode} - ;; - *) + ;; +*) echo "Usage: $0 {start|stop|restart|status}" exit 1 - ;; + ;; esac exit 0