From 70bf5a07fdf5b22201a74c355ac4489e5cffae97 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 27 Apr 2018 14:58:56 -0400 Subject: [PATCH] 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 --- tools/etc/iproute2/rt_protos.d/frr.conf | 3 ++- tools/frr | 15 +++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/tools/etc/iproute2/rt_protos.d/frr.conf b/tools/etc/iproute2/rt_protos.d/frr.conf index b8d4c1c03b..cac75bdfba 100644 --- 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 27136bb762..fec94af689 100755 --- 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 186 - ip route flush proto 188 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 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