diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-04-08 15:16:14 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-04-08 19:15:59 +0200 |
| commit | b2d7c082a2ec76e34c5ec528ac649e185d035616 (patch) | |
| tree | 256011582e089e5ff80d0ec87ea8ea5d0d5a35f3 /ospf6d | |
| parent | lib, zebra: Rename ZEBRA_VRF_ACTIVE (diff) | |
| download | frr-b2d7c082a2ec76e34c5ec528ac649e185d035616.tar.xz frr-b2d7c082a2ec76e34c5ec528ac649e185d035616.zip | |
quagga: Remove iflist global variable
The file if.c has a iflist that had the list of interfaces
in the default vrf. Remove this variable and replace
with a vrf_iflist lookup on the default vrf where it
was used.
Additionally, modify ptm code to iterate over all vrf's
when enabling ptm.
Ticket: CM-10338
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed-by: Radhika Mahankali <radhika@cumulusnetworks.com>
Diffstat (limited to 'ospf6d')
| -rw-r--r-- | ospf6d/ospf6_bfd.c | 2 | ||||
| -rw-r--r-- | ospf6d/ospf6_interface.c | 8 | ||||
| -rw-r--r-- | ospf6d/ospf6_main.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ospf6d/ospf6_bfd.c b/ospf6d/ospf6_bfd.c index f14571d1f..adcfcbf19 100644 --- a/ospf6d/ospf6_bfd.c +++ b/ospf6d/ospf6_bfd.c @@ -161,7 +161,7 @@ ospf6_bfd_nbr_replay (int command, struct zclient *zclient, zebra_size_t length, bfd_client_sendmsg(zclient, ZEBRA_BFD_CLIENT_REGISTER); /* Replay the neighbor, if BFD is enabled on the interface*/ - for (ALL_LIST_ELEMENTS_RO (iflist, inode, ifp)) + for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), inode, ifp)) { oi = (struct ospf6_interface *) ifp->info; diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index d09f8b313..a111a2148 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -1009,7 +1009,7 @@ DEFUN (show_ipv6_ospf6_interface, } else { - for (ALL_LIST_ELEMENTS_RO (iflist, i, ifp)) + for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), i, ifp)) ospf6_interface_show (vty, ifp); } @@ -1102,7 +1102,7 @@ DEFUN (show_ipv6_ospf6_interface_prefix, struct ospf6_interface *oi; struct interface *ifp; - for (ALL_LIST_ELEMENTS_RO (iflist, i, ifp)) + for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), i, ifp)) { oi = (struct ospf6_interface *) ifp->info; if (oi == NULL) @@ -1816,7 +1816,7 @@ config_write_ospf6_interface (struct vty *vty) struct ospf6_interface *oi; struct interface *ifp; - for (ALL_LIST_ELEMENTS_RO (iflist, i, ifp)) + for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), i, ifp)) { oi = (struct ospf6_interface *) ifp->info; if (oi == NULL) @@ -1984,7 +1984,7 @@ DEFUN (clear_ipv6_ospf6_interface, if (argc == 0) /* Clear all the ospfv3 interfaces. */ { - for (ALL_LIST_ELEMENTS_RO (iflist, node, ifp)) + for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp)) ospf6_interface_clear (vty, ifp); } else /* Interface name is specified. */ diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c index 4eb22c15a..9017e8b34 100644 --- a/ospf6d/ospf6_main.c +++ b/ospf6d/ospf6_main.c @@ -145,7 +145,7 @@ ospf6_exit (int status) if (ospf6) ospf6_delete (ospf6); - for (ALL_LIST_ELEMENTS_RO(iflist, node, ifp)) + for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp)) if (ifp->info != NULL) ospf6_interface_delete(ifp->info); |