YunoHost-Apps/hotspot_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/hotspot_ynh.git synced 2024-09-03 19:25:53 +02:00
Code Issues Activity Actions

Add xlock waiting to iptables commands

Browse source
This commit is contained in:
Julien Vaubourg 2016-05-07 23:30:23 +02:00
parent b2a0aecb41
commit 852d331df3
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
conf/ynh-hotspot
View file

@ -33,7 +33,7 @@ has_ip6delegatedprefix() {
is_nat_set() { is_nat_set() {
internet_device=${1} internet_device=${1}
iptables -nvt nat -L POSTROUTING | grep MASQUERADE | grep -q "${internet_device}" iptables -w -nvt nat -L POSTROUTING | grep MASQUERADE | grep -q "${internet_device}"
} }
is_ip4nataddr_set() { is_ip4nataddr_set() {
@ -54,7 +54,7 @@ is_ip6firewall_set() {
i=${1} i=${1}
dev=$(devfromid "${i}") dev=$(devfromid "${i}")
ip6tables -nvL FORWARD | grep DROP | grep -q "${dev}" ip6tables -w -nvL FORWARD | grep DROP | grep -q "${dev}"
} }
is_forwarding_set() { is_forwarding_set() {
@ -100,7 +100,7 @@ is_running() {
set_nat() { set_nat() {
internet_device=${1} internet_device=${1}
iptables -t nat -A POSTROUTING -o "${internet_device}" -j MASQUERADE iptables -w -t nat -A POSTROUTING -o "${internet_device}" -j MASQUERADE
} }
set_ip4nataddr() { set_ip4nataddr() {
@ -122,9 +122,9 @@ set_ip6firewall() {
i=${1} i=${1}
dev=$(devfromid "${i}") dev=$(devfromid "${i}")
ip6tables -A FORWARD -i "${dev}" -j ACCEPT ip6tables -w -A FORWARD -i "${dev}" -j ACCEPT
ip6tables -A FORWARD -o "${dev}" -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT ip6tables -w -A FORWARD -o "${dev}" -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
ip6tables -A FORWARD -o "${dev}" -j DROP ip6tables -w -A FORWARD -o "${dev}" -j DROP
} }
set_forwarding() { set_forwarding() {
@ -201,7 +201,7 @@ start_hostapd() {
unset_nat() { unset_nat() {
internet_device=${1} internet_device=${1}
iptables -t nat -D POSTROUTING -o "${internet_device}" -j MASQUERADE iptables -w -t nat -D POSTROUTING -o "${internet_device}" -j MASQUERADE
} }
unset_ip4nataddr() { unset_ip4nataddr() {
@ -222,9 +222,9 @@ unset_ip6firewall() {
i=${1} i=${1}
dev=$(devfromid "${i}") dev=$(devfromid "${i}")
ip6tables -D FORWARD -i "${dev}" -j ACCEPT ip6tables -w -D FORWARD -i "${dev}" -j ACCEPT
ip6tables -D FORWARD -o "${dev}" -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT ip6tables -w -D FORWARD -o "${dev}" -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
ip6tables -D FORWARD -o "${dev}" -j DROP ip6tables -w -D FORWARD -o "${dev}" -j DROP
} }
unset_forwarding() { unset_forwarding() {

2
scripts/upgrade
View file

@ -36,7 +36,7 @@ sudo yunohost app setting hotspot gitcommit -v "${gitcommit}"
# Changes # Changes
if [ "$(ynh_setting hotspot ip6_firewall)" == '' ]; then if [ -z "$(ynh_setting hotspot ip6_firewall)" ]; then
multissid=$(ynh_setting hotspot multissid) multissid=$(ynh_setting hotspot multissid)
ip6_firewall=$(printf '1|%.0s' $(seq "${multissid}")) ip6_firewall=$(printf '1|%.0s' $(seq "${multissid}"))
ip6_firewall=$(echo "${ip6_firewall%?}") ip6_firewall=$(echo "${ip6_firewall%?}")