Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

applications/luci-splash: Always insert the mangling rules, not just when bandwidth limit is used. That makes it possible to have client bandwidth stats without using the bandwidth limit. Taken from https://github.com/freifunk/ff-control/blob/master/patches/luci-splash-mark.patch, thx Patrick

Browse source
This commit is contained in:
Manuel Munz 2013-06-04 19:24:30 +00:00
parent 49fc87429f
commit 2a366f4c55
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
applications/luci-splash/root/etc/init.d/luci_splash
View file

@ -245,18 +245,16 @@ start() {
fi fi
### Add QoS chain ### Add QoS chain
[ "$LIMIT_UP" -gt 0 -a "$LIMIT_DOWN" -gt 0 ] && { iptables -t mangle -N luci_splash_mark_out
iptables -t mangle -N luci_splash_mark_out iptables -t mangle -N luci_splash_mark_in
iptables -t mangle -N luci_splash_mark_in iptables -t mangle -I PREROUTING -j luci_splash_mark_out
iptables -t mangle -I PREROUTING -j luci_splash_mark_out iptables -t mangle -I POSTROUTING -j luci_splash_mark_in
iptables -t mangle -I POSTROUTING -j luci_splash_mark_in if [ "$HAS_IPV6" = 1 ]; then
if [ "$HAS_IPV6" = 1 ]; then ip6tables -t mangle -N luci_splash_mark_out
ip6tables -t mangle -N luci_splash_mark_out ip6tables -t mangle -N luci_splash_mark_in
ip6tables -t mangle -N luci_splash_mark_in ip6tables -t mangle -I PREROUTING -j luci_splash_mark_out
ip6tables -t mangle -I PREROUTING -j luci_splash_mark_out ip6tables -t mangle -I POSTROUTING -j luci_splash_mark_in
ip6tables -t mangle -I POSTROUTING -j luci_splash_mark_in fi
fi
}
### Find active mac addresses ### Find active mac addresses
MACS="" MACS=""

8
applications/luci-splash/root/usr/sbin/luci-splash
View file

@ -304,9 +304,11 @@ end
-- Add an iptables rule -- Add an iptables rule
function add_lease_rule(mac, ipaddr) function add_lease_rule(mac, ipaddr)
if limit_up > 0 and limit_down > 0 then os.execute("iptables -t mangle -I luci_splash_mark_out -m mac --mac-source %q -j MARK --set-mark 79" % mac)
os.execute("iptables -t mangle -I luci_splash_mark_out -m mac --mac-source %q -j MARK --set-mark 79" % mac) os.execute("iptables -t mangle -I luci_splash_mark_in -d %q -j MARK --set-mark 80" % ipaddr)
os.execute("iptables -t mangle -I luci_splash_mark_in -d %q -j MARK --set-mark 80" % ipaddr) if has_ipv6 then
os.execute("ip6tables -t mangle -I luci_splash_mark_out -m mac --mac-source %q -j MARK --set-mark 79" % mac)
os.execute("ip6tables -t mangle -I luci_splash_mark_in -d %q -j MARK --set-mark 80" % ipaddr)
end end