lede-packages-rs

commit bf0eb685dc5ba8ac0530eef48c0b2e2a674b27ae
parent 4699cfa82156e1ea41d76832bd05f18c06e4e22d
Author: champtar <champetier.etienne@gmail.com>
Date:   Thu, 14 Aug 2014 15:06:39 +0300

Merge pull request #202 from Adze1502/master

mwan3: update to version 1.5-3
Diffstat:
M
net/mwan3/Makefile
 | 
2
+-
M
net/mwan3/files/etc/hotplug.d/iface/15-mwan3
 | 
8
++++----

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mwan3
 PKG_VERSION:=1.5
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_MAINTAINER:=Jeroen Louwes <jeroen.louwes@gmail.com>
 PKG_LICENSE:=GPLv2
 
diff --git a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
@@ -27,11 +27,11 @@ mwan3_set_general_iptables()
 		$IPT -A mwan3_hook -m mark --mark 0x0/0xff00 -j mwan3_connected
 		$IPT -A mwan3_hook -m mark --mark 0x0/0xff00 -j mwan3_rules
 		$IPT -A mwan3_hook -j CONNMARK --save-mark --nfmask 0xff00 --ctmask 0xff00
+		$IPT -A mwan3_hook -m mark ! --mark 0xff00/0xff00 -j mwan3_connected
 	fi
 
 	if ! $IPT -S mwan3_output_hook &> /dev/null; then
 		$IPT -N mwan3_output_hook
-		$IPT -A mwan3_output_hook -p icmp -m icmp --icmp-type 3 -j MARK --set-xmark 0xff00/0xff00
 	fi
 
 	if ! $IPT -S PREROUTING | grep mwan3_hook &> /dev/null; then
@@ -57,11 +57,11 @@ mwan3_set_connected_iptables()
 		$IPT -F mwan3_connected
 
 		for connected_networks in $($IP route | awk '{print $1}' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}'); do
-			$IPT -A mwan3_connected -d $connected_networks -m mark --mark 0x0/0xff00 -j MARK --set-xmark 0xff00/0xff00
+			$IPT -A mwan3_connected -d $connected_networks -j MARK --set-xmark 0xff00/0xff00
 		done
 
-		$IPT -I mwan3_connected -d 224.0.0.0/3 -m mark --mark 0x0/0xff00 -j MARK --set-xmark 0xff00/0xff00
-		$IPT -I mwan3_connected -d 127.0.0.0/8 -m mark --mark 0x0/0xff00 -j MARK --set-xmark 0xff00/0xff00
+		$IPT -I mwan3_connected -d 224.0.0.0/3 -j MARK --set-xmark 0xff00/0xff00
+		$IPT -I mwan3_connected -d 127.0.0.0/8 -j MARK --set-xmark 0xff00/0xff00
 	fi
 }