From 2664233e71d9f24cca30f065a76bfc2b455015de Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Wed, 14 Jun 2017 09:23:36 +0200 Subject: [PATCH 1/2] zebra: pass srcdest information also when creating blackhole routes Signed-off-by: Christian Franke --- zebra/zebra_vty.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index 1708138d83..9d7c763c46 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -2423,10 +2423,10 @@ static_ipv6_func (struct vty *vty, int add_cmd, const char *dest_str, return CMD_WARNING; } if (add_cmd) - static_add_route (AFI_IP6, SAFI_UNICAST, type, &p, NULL, NULL, ifindex, ifname, + static_add_route (AFI_IP6, SAFI_UNICAST, type, &p, src_p, NULL, ifindex, ifname, ZEBRA_FLAG_BLACKHOLE, tag, distance, zvrf, &snh_label); else - static_delete_route (AFI_IP6, SAFI_UNICAST, type, &p, NULL, NULL, ifindex, tag, + static_delete_route (AFI_IP6, SAFI_UNICAST, type, &p, src_p, NULL, ifindex, tag, distance, zvrf, &snh_label); return CMD_SUCCESS; } From 59b28c452343c7ef29c15b77bbb4c45899c73773 Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Wed, 14 Jun 2017 09:23:40 +0200 Subject: [PATCH 2/2] zebra: fix ipv6 route command description strings Signed-off-by: Christian Franke --- zebra/zebra_vty.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index 9d7c763c46..a8bee3cf50 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -2510,7 +2510,6 @@ DEFUN (ipv6_route, "IPv6 gateway address\n" "IPv6 gateway interface name\n" "Null interface\n" - "Null interface\n" "Set tag for this route\n" "Tag value\n" "Distance value for this prefix\n" @@ -2559,7 +2558,6 @@ DEFUN (ipv6_route_flags, "IPv6 gateway interface name\n" "Emit an ICMP unreachable when matched\n" "Silently discard pkts when matched\n" - "Silently discard pkts when matched\n" "Set tag for this route\n" "Tag value\n" "Distance value for this prefix\n"