mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-12 12:53:26 +00:00
Merge pull request #3071 from donaldsharp/fix_vrf_name
lib: Allow useful display of default vrf name
This commit is contained in:
commit
890ca17a08
6
lib/if.c
6
lib/if.c
@ -656,7 +656,8 @@ DEFUN_NOSH (interface,
|
|||||||
int idx_ifname = 1;
|
int idx_ifname = 1;
|
||||||
int idx_vrf = 3;
|
int idx_vrf = 3;
|
||||||
const char *ifname = argv[idx_ifname]->arg;
|
const char *ifname = argv[idx_ifname]->arg;
|
||||||
const char *vrfname = (argc > 2) ? argv[idx_vrf]->arg : NULL;
|
const char *vrfname =
|
||||||
|
(argc > 2) ? argv[idx_vrf]->arg : VRF_DEFAULT_NAME;
|
||||||
|
|
||||||
struct interface *ifp;
|
struct interface *ifp;
|
||||||
vrf_id_t vrf_id = VRF_DEFAULT;
|
vrf_id_t vrf_id = VRF_DEFAULT;
|
||||||
@ -681,7 +682,8 @@ DEFUN_NOSH (interface,
|
|||||||
#endif /* SUNOS_5 */
|
#endif /* SUNOS_5 */
|
||||||
|
|
||||||
if (!ifp) {
|
if (!ifp) {
|
||||||
vty_out(vty, "%% interface %s not in %s\n", ifname, vrfname);
|
vty_out(vty, "%% interface %s not in %s vrf\n", ifname,
|
||||||
|
vrfname);
|
||||||
return CMD_WARNING_CONFIG_FAILED;
|
return CMD_WARNING_CONFIG_FAILED;
|
||||||
}
|
}
|
||||||
VTY_PUSH_CONTEXT(INTERFACE_NODE, ifp);
|
VTY_PUSH_CONTEXT(INTERFACE_NODE, ifp);
|
||||||
|
Loading…
Reference in New Issue
Block a user