diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-06-22 19:35:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-22 19:35:45 +0200 |
| commit | a12bb225a6681b7e7eb0aac105cbc8b745675131 (patch) | |
| tree | adb8d7935dcb1da93d6cf4082f903e412e292640 /ospf6d/ospf6_top.c | |
| parent | Merge pull request #4294 from adharkar/frr-master-fpm_rmac (diff) | |
| parent | *: change interface structure, from vrf_id to vrf (diff) | |
| download | frr-a12bb225a6681b7e7eb0aac105cbc8b745675131.tar.xz frr-a12bb225a6681b7e7eb0aac105cbc8b745675131.zip | |
Merge pull request #3775 from pguibert6WIND/ospf_missing_interface_handling_2
Ospf missing interface handling 2
Diffstat (limited to 'ospf6d/ospf6_top.c')
| -rw-r--r-- | ospf6d/ospf6_top.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index 40c612381..bbc9247b0 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -654,9 +654,10 @@ DEFUN (ospf6_interface_area, struct ospf6_interface *oi; struct interface *ifp; uint32_t area_id; + struct vrf *vrf = vrf_lookup_by_id(VRF_DEFAULT); /* find/create ospf6 interface */ - ifp = if_get_by_name(argv[idx_ifname]->arg, VRF_DEFAULT); + ifp = if_get_by_name(argv[idx_ifname]->arg, vrf); oi = (struct ospf6_interface *)ifp->info; if (oi == NULL) oi = ospf6_interface_create(ifp); @@ -714,7 +715,8 @@ DEFUN (no_ospf6_interface_area, struct interface *ifp; uint32_t area_id; - ifp = if_lookup_by_name(argv[idx_ifname]->arg, VRF_DEFAULT); + ifp = if_lookup_by_name(argv[idx_ifname]->arg, + vrf_lookup_by_id(VRF_DEFAULT)); if (ifp == NULL) { vty_out(vty, "No such interface %s\n", argv[idx_ifname]->arg); return CMD_SUCCESS; |