summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-05-02 17:38:06 +0200
committerGitHub <noreply@github.com>2017-05-02 17:38:06 +0200
commitb46be72b4aff1d413e89bc26a70a29934afe9d85 (patch)
treecd556a135211559b7e636db619dbf5257f874e86 /tools
parentvtysh: remove unused compilation file (diff)
parentMerge pull request #377 from qlyoung/frr-pthreads (diff)
downloadfrr-b46be72b4aff1d413e89bc26a70a29934afe9d85.tar.xz
frr-b46be72b4aff1d413e89bc26a70a29934afe9d85.zip
Merge branch 'master' into EIGRP
Diffstat (limited to 'tools')
-rw-r--r--tools/etc/iproute2/rt_protos.d/frr.conf8
-rwxr-xr-xtools/frr9
2 files changed, 16 insertions, 1 deletions
diff --git a/tools/etc/iproute2/rt_protos.d/frr.conf b/tools/etc/iproute2/rt_protos.d/frr.conf
new file mode 100644
index 000000000..3f55b1126
--- /dev/null
+++ b/tools/etc/iproute2/rt_protos.d/frr.conf
@@ -0,0 +1,8 @@
+# Additional protocol strings defined by frr for each of its daemons
+
+186 bgp
+187 isis
+188 ospf
+189 rip
+190 ripng
+191 static
diff --git a/tools/frr b/tools/frr
index 8ae0b0a6e..ad3745147 100755
--- a/tools/frr
+++ b/tools/frr
@@ -532,8 +532,15 @@ case "$1" in
fi
if [ -z "$dmn" -o "$dmn" = "zebra" ]; then
- echo "Removing all routes made by zebra."
+ echo "Removing all routes made by FRR."
+ ip route flush proto bgp
+ ip route flush proto ospf
+ ip route flush proto static
+ ip route flush proto rip
+ ip route flush proto ripng
ip route flush proto zebra
+ ip route flush proto isis
+
else
[ -n "$dmn" ] && eval "${dmn/-/_}=0"
start_watchfrr