summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2018-06-06 12:20:00 +0300
committerGitHub <noreply@github.com>2018-06-06 12:20:00 +0300
commit87825e6f3614ffafea171f45094deabc1dcf213b (patch)
tree1a5a81b898edc528f1e281f76e8aa263ea5baa6d
parent81873e11aef79d9af67d60ae45a3bbb6f009c375 (diff)
parentb6249f1781efc4fefbdf87b661d53c0923ec7438 (diff)
Merge pull request #6198 from TDT-AG/pr/20180523-net-mwan3-fix-ndp
net/mwan3: fix Ipv6 RA service
-rw-r--r--net/mwan3/Makefile2
-rw-r--r--net/mwan3/files/lib/mwan3/mwan3.sh8
2 files changed, 9 insertions, 1 deletions
diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile
index 83e514be7..adb54b24a 100644
--- a/net/mwan3/Makefile
+++ b/net/mwan3/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mwan3
-PKG_VERSION:=2.6.17
+PKG_VERSION:=2.6.18
PKG_RELEASE:=1
PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>
PKG_LICENSE:=GPLv2
diff --git a/net/mwan3/files/lib/mwan3/mwan3.sh b/net/mwan3/files/lib/mwan3/mwan3.sh
index 74d5592eb..2c5bbf3c1 100644
--- a/net/mwan3/files/lib/mwan3/mwan3.sh
+++ b/net/mwan3/files/lib/mwan3/mwan3.sh
@@ -198,6 +198,14 @@ mwan3_set_general_iptables()
if ! $IPT -S mwan3_hook &> /dev/null; then
$IPT -N mwan3_hook
+ # do not mangle ipv6 ra service
+ if [ "$IPT" = "$IPT6" ]; then
+ $IPT6 -A mwan3_hook -p ipv6-icmp -m icmp6 --icmpv6-type 133 -j RETURN
+ $IPT6 -A mwan3_hook -p ipv6-icmp -m icmp6 --icmpv6-type 134 -j RETURN
+ $IPT6 -A mwan3_hook -p ipv6-icmp -m icmp6 --icmpv6-type 135 -j RETURN
+ $IPT6 -A mwan3_hook -p ipv6-icmp -m icmp6 --icmpv6-type 136 -j RETURN
+ $IPT6 -A mwan3_hook -p ipv6-icmp -m icmp6 --icmpv6-type 137 -j RETURN
+ fi
$IPT -A mwan3_hook -j CONNMARK --restore-mark --nfmask $MMX_MASK --ctmask $MMX_MASK
$IPT -A mwan3_hook -m mark --mark 0x0/$MMX_MASK -j mwan3_ifaces_in
$IPT -A mwan3_hook -m mark --mark 0x0/$MMX_MASK -j mwan3_connected