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 /babeld | |
| 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 'babeld')
| -rw-r--r-- | babeld/babel_interface.c | 10 | ||||
| -rw-r--r-- | babeld/babeld.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/babeld/babel_interface.c b/babeld/babel_interface.c index 0eeb9b2bb..36adf118a 100644 --- a/babeld/babel_interface.c +++ b/babeld/babel_interface.c @@ -242,7 +242,7 @@ babel_enable_if_add (const char *ifname) vector_set (babel_enable_if, strdup (ifname)); - ifp = if_lookup_by_name(ifname, VRF_DEFAULT); + ifp = if_lookup_by_name(ifname, vrf_lookup_by_id(VRF_DEFAULT)); if (ifp != NULL) interface_recalculate(ifp); @@ -265,7 +265,7 @@ babel_enable_if_delete (const char *ifname) free (str); vector_unset (babel_enable_if, babel_enable_if_index); - ifp = if_lookup_by_name(ifname, VRF_DEFAULT); + ifp = if_lookup_by_name(ifname, vrf_lookup_by_id(VRF_DEFAULT)); if (ifp != NULL) interface_reset(ifp); @@ -908,7 +908,8 @@ DEFUN (show_babel_interface, show_babel_interface_sub (vty, ifp); return CMD_SUCCESS; } - if ((ifp = if_lookup_by_name (argv[3]->arg, VRF_DEFAULT)) == NULL) + if ((ifp = if_lookup_by_name (argv[3]->arg, + vrf_lookup_by_id(VRF_DEFAULT))) == NULL) { vty_out (vty, "No such interface name\n"); return CMD_WARNING; @@ -950,7 +951,8 @@ DEFUN (show_babel_neighbour, } return CMD_SUCCESS; } - if ((ifp = if_lookup_by_name (argv[3]->arg, VRF_DEFAULT)) == NULL) + if ((ifp = if_lookup_by_name (argv[3]->arg, + vrf_lookup_by_id(VRF_DEFAULT))) == NULL) { vty_out (vty, "No such interface name\n"); return CMD_WARNING; diff --git a/babeld/babeld.c b/babeld/babeld.c index 6ad004a4a..736dedcf7 100644 --- a/babeld/babeld.c +++ b/babeld/babeld.c @@ -557,7 +557,7 @@ babel_distribute_update (struct distribute_ctx *ctx, struct distribute *dist) if (! dist->ifname) return; - ifp = if_lookup_by_name (dist->ifname, VRF_DEFAULT); + ifp = if_lookup_by_name (dist->ifname, vrf_lookup_by_id(VRF_DEFAULT)); if (ifp == NULL) return; |