proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 07:48:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: static route cleanup

Browse Source 
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

- The 'reject' keyword was being lost
- Hide the "ip route A.B.C.D A.B.C.D" config options since these will be
  displayed as "ip route A.B.C.D/X"
This commit is contained in:
Daniel Walton 2017-07-25 13:24:45 -07:00
parent 92690ee649
commit 1ac79ce8df
1 changed files with 61 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zebra/zebra_vty.c
View File

@ -444,7 +444,7 @@ DEFUN (ip_route_flags,
} }
/* Mask as A.B.C.D format. */ /* Mask as A.B.C.D format. */
DEFUN (ip_route_mask, DEFUN_HIDDEN (ip_route_mask,
ip_route_mask_cmd, ip_route_mask_cmd,
"ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> [tag (1-4294967295)] [(1-255)] [vrf NAME]", "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> [tag (1-4294967295)] [(1-255)] [vrf NAME]",
IP_STR IP_STR
@ -475,7 +475,7 @@ DEFUN (ip_route_mask,
distance, vrf, NULL); distance, vrf, NULL);
} }
DEFUN (ip_route_mask_flags, DEFUN_HIDDEN (ip_route_mask_flags,
ip_route_mask_flags_cmd, ip_route_mask_flags_cmd,
"ip route A.B.C.D A.B.C.D <reject|blackhole> [tag (1-4294967295)] [(1-255)] [vrf NAME]", "ip route A.B.C.D A.B.C.D <reject|blackhole> [tag (1-4294967295)] [(1-255)] [vrf NAME]",
IP_STR IP_STR
@ -562,7 +562,7 @@ DEFUN (no_ip_route_flags,
NULL, tag, distance, vrf, NULL); NULL, tag, distance, vrf, NULL);
} }
DEFUN (no_ip_route_mask, DEFUN_HIDDEN (no_ip_route_mask,
no_ip_route_mask_cmd, no_ip_route_mask_cmd,
"no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> [tag (1-4294967295)] [(1-255)] [vrf NAME]", "no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> [tag (1-4294967295)] [(1-255)] [vrf NAME]",
NO_STR NO_STR
@ -594,7 +594,7 @@ DEFUN (no_ip_route_mask,
distance, vrf, NULL); distance, vrf, NULL);
} }
DEFUN (no_ip_route_mask_flags, DEFUN_HIDDEN (no_ip_route_mask_flags,
no_ip_route_mask_flags_cmd, no_ip_route_mask_flags_cmd,
"no ip route A.B.C.D A.B.C.D <reject|blackhole> [tag (1-4294967295)] [(1-255)] [vrf NAME]", "no ip route A.B.C.D A.B.C.D <reject|blackhole> [tag (1-4294967295)] [(1-255)] [vrf NAME]",
NO_STR NO_STR
@ -1937,7 +1937,11 @@ static int static_config(struct vty *vty, afi_t afi, safi_t safi,
case STATIC_IFINDEX: case STATIC_IFINDEX:
vty_out(vty, " %s", si->ifname); vty_out(vty, " %s", si->ifname);
break; break;
/* blackhole and Null0 mean the same thing */
case STATIC_BLACKHOLE: case STATIC_BLACKHOLE:
if (CHECK_FLAG(si->flags, ZEBRA_FLAG_REJECT))
vty_out(vty, " reject");
else
vty_out(vty, " Null0"); vty_out(vty, " Null0");
break; break;
case STATIC_IPV6_GATEWAY_IFINDEX: case STATIC_IPV6_GATEWAY_IFINDEX: