From d7d75634e9576ea89c4397b2749afd124db8799e Mon Sep 17 00:00:00 2001 From: Daniel Walton Date: Wed, 20 Sep 2017 22:24:27 +0400 Subject: [PATCH] zebra: cleanup reject vs blackhole vs null0 vs Null0 Signed-off-by: Daniel Walton --- zebra/zebra_vty.c | 102 ++++++++++------------------------------------ 1 file changed, 22 insertions(+), 80 deletions(-) diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index 89ed6ce7b8..ecc8fe94e2 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -338,48 +338,17 @@ DEFUN (show_ip_rpf_addr, return CMD_SUCCESS; } -DEFPY (ip_route_reject, - ip_route_reject_cmd, - "[no] ip route\ - \ - $flag \ - [{ \ - tag (1-4294967295) \ - |(1-255)$distance \ - |vrf NAME \ - |label WORD \ - }]", - NO_STR - IP_STR - "Establish static routes\n" - "IP destination prefix (e.g. 10.0.0.0/8)\n" - "IP destination prefix\n" - "IP destination prefix mask\n" - "Null interface\n" - "Emit an ICMP unreachable when matched\n" - "Silently discard pkts when matched\n" - "Set tag for this route\n" - "Tag value\n" - "Distance value for this route\n" - VRF_CMD_HELP_STR - MPLS_LABEL_HELPSTR) -{ - return zebra_static_route(vty, AFI_IP, SAFI_UNICAST, no, prefix, - mask_str, NULL, NULL, NULL, flag, - tag_str, distance_str, vrf, label); -} - /* Static route configuration. */ DEFPY(ip_route, ip_route_cmd, "[no] ip route\ - \ - {A.B.C.D$gate|INTERFACE$ifname} \ - [{ \ - tag (1-4294967295) \ - |(1-255)$distance \ - |vrf NAME \ - |label WORD \ + \ + \ + [{ \ + tag (1-4294967295) \ + |(1-255)$distance \ + |vrf NAME \ + |label WORD \ }]", NO_STR IP_STR "Establish static routes\n" @@ -388,6 +357,9 @@ DEFPY(ip_route, "IP destination prefix mask\n" "IP gateway address\n" "IP gateway interface name\n" + "Null interface\n" + "Emit an ICMP unreachable when matched\n" + "Silently discard pkts when matched\n" "Set tag for this route\n" "Tag value\n" "Distance value for this route\n" @@ -395,7 +367,7 @@ DEFPY(ip_route, MPLS_LABEL_HELPSTR) { return zebra_static_route(vty, AFI_IP, SAFI_UNICAST, no, prefix, - mask_str, NULL, gate_str, ifname, NULL, + mask_str, NULL, gate_str, ifname, flag, tag_str, distance_str, vrf, label); } @@ -1790,46 +1762,15 @@ static int static_config(struct vty *vty, afi_t afi, safi_t safi, return write; } -DEFPY (ipv6_route_reject, - ipv6_route_reject_cmd, - "[no] ipv6 route X:X::X:X/M$prefix [from X:X::X:X/M] \ - $flag \ - [{ \ - tag (1-4294967295) \ - |(1-255)$distance \ - |vrf NAME \ - |label WORD \ - }]", - NO_STR - IPV6_STR - "Establish static routes\n" - "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" - "IPv6 source-dest route\n" - "IPv6 source prefix\n" - "Null interface\n" - "Emit an ICMP unreachable when matched\n" - "Silently discard pkts when matched\n" - "Set tag for this route\n" - "Tag value\n" - "Distance value for this prefix\n" - VRF_CMD_HELP_STR - MPLS_LABEL_HELPSTR) -{ - return zebra_static_route(vty, AFI_IP6, SAFI_UNICAST, no, prefix_str, - NULL, from_str, NULL, NULL, flag, - tag_str, distance_str, vrf, label); -} - - DEFPY(ipv6_route, ipv6_route_cmd, - "[no] ipv6 route X:X::X:X/M$prefix [from X:X::X:X/M] \ - {X:X::X:X$gate|INTERFACE$ifname} \ - [{ \ - tag (1-4294967295) \ - |(1-255)$distance \ - |vrf NAME \ - |label WORD \ + "[no] ipv6 route X:X::X:X/M$prefix [from X:X::X:X/M] \ + \ + [{ \ + tag (1-4294967295) \ + |(1-255)$distance \ + |vrf NAME \ + |label WORD \ }]", NO_STR IPV6_STR @@ -1839,6 +1780,9 @@ DEFPY(ipv6_route, "IPv6 source prefix\n" "IPv6 gateway address\n" "IPv6 gateway interface name\n" + "Null interface\n" + "Emit an ICMP unreachable when matched\n" + "Silently discard pkts when matched\n" "Set tag for this route\n" "Tag value\n" "Distance value for this prefix\n" @@ -1846,7 +1790,7 @@ DEFPY(ipv6_route, MPLS_LABEL_HELPSTR) { return zebra_static_route(vty, AFI_IP6, SAFI_UNICAST, no, prefix_str, - NULL, from_str, gate_str, ifname, NULL, + NULL, from_str, gate_str, ifname, flag, tag_str, distance_str, vrf, label); } @@ -2734,7 +2678,6 @@ void zebra_vty_init(void) install_element(CONFIG_NODE, &ip_multicast_mode_cmd); install_element(CONFIG_NODE, &no_ip_multicast_mode_cmd); install_element(CONFIG_NODE, &ip_route_cmd); - install_element(CONFIG_NODE, &ip_route_reject_cmd); install_element(CONFIG_NODE, &ip_zebra_import_table_distance_cmd); install_element(CONFIG_NODE, &no_ip_zebra_import_table_cmd); @@ -2758,7 +2701,6 @@ void zebra_vty_init(void) install_element(VIEW_NODE, &show_ip_route_vrf_all_summary_prefix_cmd); install_element(CONFIG_NODE, &ipv6_route_cmd); - install_element(CONFIG_NODE, &ipv6_route_reject_cmd); install_element(CONFIG_NODE, &ip_nht_default_route_cmd); install_element(CONFIG_NODE, &no_ip_nht_default_route_cmd); install_element(CONFIG_NODE, &ipv6_nht_default_route_cmd); -- 2.39.5