Merge pull request #2896 from dslicenc/zebra_select_vrf

zebra: if multiple connecteds, select loopback or vrf if present

2 files changed, 9 insertions, 0 deletions

diff --git a/lib/if.c b/lib/if.c
index 943436f356..2bf0c6e6b5 100644
--- a/lib/if.c
+++ b/lib/if.c
@@ -472,6 +472,14 @@ int if_is_vrf(struct interface *ifp)
 	return CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_VRF_LOOPBACK);
 }
 
+bool if_is_loopback_or_vrf(struct interface *ifp)
+{
+	if (if_is_loopback(ifp) || if_is_vrf(ifp))
+		return true;
+
+	return false;
+}
+
 /* Does this interface support broadcast ? */
 int if_is_broadcast(struct interface *ifp)
 {
diff --git a/lib/if.h b/lib/if.h
index 3a9c4af848..a861cf2d85 100644
--- a/lib/if.h
+++ b/lib/if.h
@@ -497,6 +497,7 @@ extern int if_is_operative(struct interface *);
 extern int if_is_no_ptm_operative(struct interface *);
 extern int if_is_loopback(struct interface *);
 extern int if_is_vrf(struct interface *ifp);
+extern bool if_is_loopback_or_vrf(struct interface *ifp);
 extern int if_is_broadcast(struct interface *);
 extern int if_is_pointopoint(struct interface *);
 extern int if_is_multicast(struct interface *);