summaryrefslogtreecommitdiffstats
path: root/isisd
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2016-04-08 15:16:14 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2016-04-08 19:15:59 +0200
commitb2d7c082a2ec76e34c5ec528ac649e185d035616 (patch)
tree256011582e089e5ff80d0ec87ea8ea5d0d5a35f3 /isisd
parentlib, zebra: Rename ZEBRA_VRF_ACTIVE (diff)
downloadfrr-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 'isisd')
-rw-r--r--isisd/isis_circuit.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index 83d0aa432..16ec409d4 100644
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -32,6 +32,7 @@
#include "log.h"
#include "memory.h"
+#include "vrf.h"
#include "if.h"
#include "linklist.h"
#include "command.h"
@@ -1024,7 +1025,7 @@ isis_interface_config_write (struct vty *vty)
struct isis_circuit *circuit;
int i;
- for (ALL_LIST_ELEMENTS_RO (iflist, node, ifp))
+ for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp))
{
if (ifp->ifindex == IFINDEX_DELETED)
continue;