summaryrefslogtreecommitdiff
path: root/templates/protocols/static
diff options
context:
space:
mode:
authorBob Gilligan <gilligan@vyatta.com>2010-01-15 13:45:14 -0800
committerBob Gilligan <gilligan@vyatta.com>2010-01-15 13:45:14 -0800
commit13e4a3cca6dfd0f4ef286c3a9559635fe572fdce (patch)
treee4be8c587c0c3782adc5a7ab632cf1fa2b13f98b /templates/protocols/static
parent50fba4614e6544741d1b16aff59234eadb6ffa6e (diff)
downloadvyatta-cfg-quagga-13e4a3cca6dfd0f4ef286c3a9559635fe572fdce.tar.gz
vyatta-cfg-quagga-13e4a3cca6dfd0f4ef286c3a9559635fe572fdce.zip
Bugfix 5221: Allow outgoing interface to be specified for IPv6 static route.
When configuring an IPv6 static route where the next-hop is a link-local address, the outgoing interface must be specified. This change adds a new parameter named "interface" under the IPv6 static route config parameter sub-tree.
Diffstat (limited to 'templates/protocols/static')
-rw-r--r--templates/protocols/static/route6/node.tag/next-hop/node.def8
-rw-r--r--templates/protocols/static/route6/node.tag/next-hop/node.tag/interface/node.def8
2 files changed, 15 insertions, 1 deletions
diff --git a/templates/protocols/static/route6/node.tag/next-hop/node.def b/templates/protocols/static/route6/node.tag/next-hop/node.def
index a9a20c44..3f90e757 100644
--- a/templates/protocols/static/route6/node.tag/next-hop/node.def
+++ b/templates/protocols/static/route6/node.tag/next-hop/node.def
@@ -17,8 +17,14 @@ end:
then
DIST="$VAR(./distance/@)"
fi
+
+ if [[ -n "$VAR(./interface/@)" ]]
+ then
+ INTERFACE="$VAR(./interface/@)"
+ fi
+
vyatta-vtysh -c "configure terminal" \
- -c "ipv6 route $VAR(../@) $VAR(@) $DIST";
+ -c "ipv6 route $VAR(../@) $VAR(@) $INTERFACE $DIST";
fi
else
if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl \
diff --git a/templates/protocols/static/route6/node.tag/next-hop/node.tag/interface/node.def b/templates/protocols/static/route6/node.tag/next-hop/node.tag/interface/node.def
new file mode 100644
index 00000000..cfa62570
--- /dev/null
+++ b/templates/protocols/static/route6/node.tag/next-hop/node.tag/interface/node.def
@@ -0,0 +1,8 @@
+type: txt
+
+help: Set the outgoing interface
+
+# show all current interface
+# but syntax accepts any interface since it may exist later (ppp etc)
+allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all
+