From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 31 Oct 2011 19:40:29 +0000 (+0000)
Subject: Fix setting local routes on zone's routing tables.
X-Git-Tag: 003~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5bace8d613ddad17db53cc375d92a623af67fb6;p=network.git

Fix setting local routes on zone's routing tables.
---

diff --git a/functions.ipv4 b/functions.ipv4
index 678b1e73..d074ca94 100644
--- a/functions.ipv4
+++ b/functions.ipv4
@@ -57,3 +57,19 @@ function ipv4_update_neighbours() {
 	arping -q -A -c 1 -I ${device} ${address}
 	( sleep 2; arping -q -U -c 1 -I ${device} ${address} ) >/dev/null 2>&1 </dev/null &
 }
+
+function ipv4_get_netaddress() {
+	local address=${1}
+	assert isset address
+
+	local prefix=$(ip_get_prefix ${address})
+	assert isset prefix
+
+	local NETWORK
+	eval $(ipcalc --network ${address})
+	assert isset NETWORK
+
+	echo "${NETWORK}/${prefix}"
+
+	return ${EXIT_OK}
+}
diff --git a/functions.routing b/functions.routing
index 05cd1b29..986596ac 100644
--- a/functions.routing
+++ b/functions.routing
@@ -211,12 +211,17 @@ function routing_update() {
 	cmd ip route flush table ${table}
 
 	local local_ip_address=$(routing_db_get ${zone} ${proto} local-ip-address)
+	local remote_ip_address=$(routing_db_get ${zone} ${proto} remote-ip-address)
 
 	# XXX does not work.
-	#log DEBUG "Adding route for subnet ${local_ip_address} to table ${table}"
-	#cmd ip route add table ${table} ${local_ip_address} dev ${zone}
-
-	local remote_ip_address=$(routing_db_get ${zone} ${proto} remote-ip-address)
+	case "${proto}" in
+		ipv4)
+			local net_address=$(ipv4_get_netaddress ${local_ip_address})
+
+			log DEBUG "Adding route for subnet ${local_ip_address} to table ${table}"
+			cmd ip route add table ${table} ${net_address} dev ${zone}
+			;;
+	esac
 
 	if isset remote_ip_address; then
 		log DEBUG "Adding default route for table ${table}"