diff options
| author | Bastian Bittorf <bb@npl.de> | 2016-11-05 10:16:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-05 10:16:04 +0100 |
| commit | 1975a41c2cc4ba0e612e7c617d9515b2f3e1e6b1 (patch) | |
| tree | 26d6ed01852a33ea4abb93f489eabc4b23096fe8 | |
| parent | 17d50421de2334a3949712807a849c01b469e234 (diff) | |
| parent | 27762fdabea92376e3e1af8e43fd432915c038e4 (diff) | |
Merge pull request #239 from sarumpaet/for-15.05
Cherry-pick olsrd1 IPv6 fixes to for-15.05
| -rw-r--r-- | olsrd/files/olsrd.init | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init index 3ced911..43c7e67 100644 --- a/olsrd/files/olsrd.init +++ b/olsrd/files/olsrd.init @@ -397,7 +397,7 @@ olsrd_write_olsrd() { [ "$OLSRD_COUNT" -gt 0 ] && return 0 config_get ipversion "$cfg" IpVersion - if [ "$UCI_CONF_NAME" == "olsrd6" ]; then + if [ "$UCI_CONF_NAME" = "olsrd6" ]; then OLSRD_OLSRD_SCHEMA="$OLSRD_OLSRD_SCHEMA IpVersion=6" if [ "$ipversion" = "6and4" ]; then error "IpVersion 6and4 not supported in olsrd6" @@ -703,21 +703,29 @@ olsrd_setup_smartgw_rules() { IP6T=$(which ip6tables) # Delete smartgw firewall rules first - for IPT in $IP4T $IP6T; do - while $IPT -D forwarding_rule -o tnl_+ -j ACCEPT 2> /dev/null; do :;done + if [ "$UCI_CONF_NAME" = "olsrd6" ]; then + while $IP6T -D forwarding_rule -o tnl_+ -j ACCEPT 2> /dev/null; do :;done for IFACE in $wanifnames; do - while $IPT -D forwarding_rule -i tunl0 -o $IFACE -j ACCEPT 2> /dev/null; do :; done + while $IP6T -D forwarding_rule -i tunl0 -o $IFACE -j ACCEPT 2> /dev/null; do :; done done for IFACE in $ifsglobal; do - while $IPT -D input_rule -i $IFACE -p 4 -j ACCEPT 2> /dev/null; do :; done + while $IP6T -D input_rule -i $IFACE -p 4 -j ACCEPT 2> /dev/null; do :; done done - done - while $IP4T -t nat -D postrouting_rule -o tnl_+ -j MASQUERADE 2> /dev/null; do :;done + else + while $IP4T -D forwarding_rule -o tnl_+ -j ACCEPT 2> /dev/null; do :;done + for IFACE in $wanifnames; do + while $IP4T -D forwarding_rule -i tunl0 -o $IFACE -j ACCEPT 2> /dev/null; do :; done + done + for IFACE in $ifsglobal; do + while $IP4T -D input_rule -i $IFACE -p 4 -j ACCEPT 2> /dev/null; do :; done + done + while $IP4T -t nat -D postrouting_rule -o tnl_+ -j MASQUERADE 2> /dev/null; do :;done + fi - if [ "$smartgateway" == "yes" ]; then + if [ "$smartgateway" = "yes" ]; then log "$funcname() Notice: Inserting firewall rules for SmartGateway" - if [ ! "$smartgatewayuplink" == "none" ]; then - if [ "$smartgatewayuplink" == "ipv4" ]; then + if [ ! "$smartgatewayuplink" = "none" ]; then + if [ "$smartgatewayuplink" = "ipv4" ]; then # Allow everything to be forwarded to tnl_+ and use NAT for it $IP4T -I forwarding_rule -o tnl_+ -j ACCEPT $IP4T -t nat -I postrouting_rule -o tnl_+ -j MASQUERADE @@ -731,7 +739,7 @@ olsrd_setup_smartgw_rules() { for IFACE in $ifsglobal; do $IP4T -I input_rule -i $IFACE -p 4 -j ACCEPT done - elif [ "$smartgatewayuplink" == "ipv6" ]; then + elif [ "$smartgatewayuplink" = "ipv6" ]; then $IP6T -I forwarding_rule -o tnl_+ -j ACCEPT if [ "$nowan"="0" ]; then for IFACE in $wanifnames; do |