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>

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/vrf.c b/lib/vrf.c
index 329e9a4d06..f730c539f5 100644
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -70,7 +70,7 @@ vrf_list_lookup_by_name (const char *name)
   return NULL;
 }
 
-/* Create new interface structure. */
+/* Create new vrf structure. */
 struct vrf *
 vrf_create (const char *name, size_t namelen)
 {
@@ -184,7 +184,7 @@ vrf_get (vrf_id_t vrf_id, const char *name)
       vrf->node = rn;
 
       /* Initialize interfaces. */
-      if_init (vrf_id, &vrf->iflist);
+      if_init (&vrf->iflist);
     }
 
   if (vrf_master.vrf_new_hook && name) {
@@ -210,7 +210,7 @@ vrf_delete (struct vrf *vrf)
     (*vrf_master.vrf_delete_hook) (vrf->vrf_id, vrf->name, &vrf->info);
 
   if (CHECK_FLAG (vrf->status, VRF_ACTIVE))
-    if_terminate (vrf->vrf_id, &vrf->iflist);
+    if_terminate (&vrf->iflist);
 
   if (vrf->node)
     {
@@ -491,7 +491,7 @@ vrf_iflist_create (vrf_id_t vrf_id)
 {
    struct vrf * vrf = vrf_lookup (vrf_id);
    if (vrf && !vrf->iflist)
-     if_init (vrf_id, &vrf->iflist);
+     if_init (&vrf->iflist);
 }
 
 /* Free the interface list of the specified VRF. */
@@ -500,7 +500,7 @@ vrf_iflist_terminate (vrf_id_t vrf_id)
 {
    struct vrf * vrf = vrf_lookup (vrf_id);
    if (vrf && vrf->iflist)
-     if_terminate (vrf->vrf_id, &vrf->iflist);
+     if_terminate (&vrf->iflist);
 }
 
 /*