From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 20 May 2015 01:29:16 +0000 (-0700)
Subject: ospfd: ospfd-virtual-link.patch
X-Git-Tag: frr-2.0-rc1~1370
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=90c97340627457b0f1c988d5b0903e8bb038c47d;p=matthieu%2Ffrr.git

ospfd: ospfd-virtual-link.patch
ospfd: virtual links fix
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by:

Basically ZEBRA_INTERFACE_LINKDETECTION is set to on by default now.
Virtual links are failing to identify as up because of this code change.
Modify ospf to set the flag as appropriate
---

diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c
index 6c330e95dc..14af7e3425 100644
--- a/ospfd/ospf_interface.c
+++ b/ospfd/ospf_interface.c
@@ -883,6 +883,11 @@ ospf_vl_new (struct ospf *ospf, struct ospf_vl_data *vl_data)
 
   snprintf (ifname, sizeof(ifname), "VLINK%d", vlink_count);
   vi = if_create (ifname, strnlen(ifname, sizeof(ifname)));
+  /*
+   * if_create sets ZEBRA_INTERFACE_LINKDETECTION
+   * virtual links don't need this.
+   */
+  UNSET_FLAG (vi->status, ZEBRA_INTERFACE_LINKDETECTION);
   co = connected_new ();
   co->ifp = vi;
   listnode_add (vi->connected, co);