tools: Cleanup code to handle sharp and pbr a bit better

The sharp and pbr protocols needed a bit more handling
to be 'right' from a start/stop perspective.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/tools/etc/iproute2/rt_protos.d/frr.conf b/tools/etc/iproute2/rt_protos.d/frr.conf
index b8d4c1c03b1d03a90e84ee98d76f1fd656d9d862..cac75bdfbabb4c193b8a2ade47d8e00aee0b08c8 100644 (file)
--- a/tools/etc/iproute2/rt_protos.d/frr.conf
+++ b/tools/etc/iproute2/rt_protos.d/frr.conf
@@ -8,4 +8,5 @@
 191  nhrp
 192  eigrp
 193  ldp
-194  sharp
\ No newline at end of file
+194  sharp
+195  pbr

diff --git a/tools/frr b/tools/frr
index 27136bb762135c608285584aca8cfe0a44160dcb..fec94af689ec3808d27aec930c2470a92b7ed161 100755 (executable)
--- a/tools/frr
+++ b/tools/frr
@@ -552,16 +552,19 @@ case "$1" in
          # Additionally if a new protocol is added
          # we need to add it here as well as
          # in rt_netlink.h( follow the directions! )
+          ip route flush proto 4
+          ip route flush proto 11
+          ip route flush proto 42
           ip route flush proto 186
+          ip route flush proto 187
           ip route flush proto 188
-          ip route flush proto 4
           ip route flush proto 189
           ip route flush proto 190
-          ip route flush proto 11
-          ip route flush proto 187
-          ip route flush proto 192
-          ip route flush proto 42
           ip route flush proto 191
+          ip route flush proto 192
+          ip route flush proto 193
+          ip route flush proto 194
+          ip route flush proto 195
        else
          [ -n "$dmn" ] && eval "${dmn/-/_}=0"
          start_watchfrr