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

contrib/freifunk-policyrouting: Make it work with trunk, remove unnecessary setup of network route for the local network at wan

Browse source
This commit is contained in:
Manuel Munz 2012-08-13 19:03:23 +00:00
parent 489e69edfd
commit 4b0b9841de
1 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting
View file

@ -1,6 +1,5 @@
[ "$INTERFACE" != "wan" ] && exit 0 [ "$INTERFACE" != "wan" ] && exit 0
[ -f /proc/net/ipv6_route ] && has_ipv6=1 [ -f /proc/net/ipv6_route ] && has_ipv6=1
case $ACTION in case $ACTION in
ifup) ifup)
pr="`uci get freifunk-policyrouting.pr.enable`" pr="`uci get freifunk-policyrouting.pr.enable`"
@ -8,7 +7,7 @@ case $ACTION in
# check if ipv6 is enabled: # check if ipv6 is enabled:
if [ $pr = "1" ]; then if [ $pr = "1" ]; then
logger -t policyrouting "Starting policy routing on $INTERFACE" logger -s -t policyrouting "Starting policy routing on $INTERFACE"
# Setup new tables # Setup new tables
tables="/etc/iproute2/rt_tables" tables="/etc/iproute2/rt_tables"
@ -40,23 +39,16 @@ case $ACTION in
uci commit uci commit
fi fi
gw=`uci -p /var/state get network.wan.gateway` gw="$(ip r |grep default | cut -d " " -f 3)"
netmask=`uci -p /var/state get network.wan.netmask` # if no gateway was found stop now
if [ -z "$netmask" ]; then [ -z "$gw" ] && logger -s -t policyrouting "No gateway found" && exit 1
NETMASK="255.255.255.255"
fi device="`uci -q -p /var/state get network.wan.ifname`"
[ -z "$device" ] && device="`uci -q -p /var/state get network.wan.device`"
if [ -n "`uci -p /var/state get network.wan.ifname`" ]; then [ -z "$device" ] && logger -s -t policyrouting "No device found for wan." && exit 1
device=`uci -p /var/state get network.wan.ifname`
else
device=`uci -p /var/state get network.wan.device`
fi
eval `ipcalc.sh $gw $netmask`
test -n "`ip r s t default`" && ip r d default t default test -n "`ip r s t default`" && ip r d default t default
test -n "`ip r s |grep default`" && ip route del default test -n "`ip r s |grep default`" && ip route del default
ip route add $NETWORK/$NETMASK dev $device table default
ip route add default via $gw dev $device table default ip route add default via $gw dev $device table default
if [ "$has_ipv6" = 1 ]; then if [ "$has_ipv6" = 1 ]; then
@ -96,12 +88,12 @@ case $ACTION in
;; ;;
ifdown) ifdown)
logger -t policyrouting "Deleting ipv4 policy rules for $INTERFACE" logger -s -t policyrouting "Deleting ipv4 policy rules for $INTERFACE"
ip rule del fwmark 1 lookup olsr-default > /dev/null 2>&1 ip rule del fwmark 1 lookup olsr-default > /dev/null 2>&1
ip rule del lookup olsr-default > /dev/null 2>&1 ip rule del lookup olsr-default > /dev/null 2>&1
ip rule del lookup olsr > /dev/null 2>&1 ip rule del lookup olsr > /dev/null 2>&1
if [ "$has_ipv6" = 1 ]; then if [ "$has_ipv6" = 1 ]; then
logger -t policyrouting "Deleting ipv4 policy rules for $INTERFACE" logger -s -t policyrouting "Deleting ipv4 policy rules for $INTERFACE"
ip -6 rule del fwmark 1 lookup olsr-default > /dev/null 2>&1 ip -6 rule del fwmark 1 lookup olsr-default > /dev/null 2>&1
ip -6 rule del lookup olsr-default > /dev/null 2>&1 ip -6 rule del lookup olsr-default > /dev/null 2>&1
ip -6 rule del lookup olsr > /dev/null 2>&1 ip -6 rule del lookup olsr > /dev/null 2>&1