zebra: Set link-detect on by default
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Reviewed-by: Dinesh G Dutt <ddutt at cumulusnetworks.com>
Reviewed-by: Scott Feldman <sfeldma at cumulusnetworks.com>
Edited by Christian Franke: Fix OSPF Virtual Links
Edited by Donald Sharp: Add NEWS notification
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Acked-By: paul@jakma.org
diff --git a/NEWS b/NEWS
index 8f9dd7a..155b25c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
Note: this file lists major user-visible changes only.
+* Changes in Quagga []
+
+- [zebra] "no link-detect" is no longer the default. To retain current
+ behavior save your config before updating, else remove it from
+ you config prior to update.
+
* Changes in Quagga 0.99.24
User-visible changes:
diff --git a/lib/if.c b/lib/if.c
index 0fc4b60..5aa8250 100644
--- a/lib/if.c
+++ b/lib/if.c
@@ -135,6 +135,9 @@
ifp->connected = list_new ();
ifp->connected->del = (void (*) (void *)) connected_free;
+ /* Enable Link-detection by default */
+ SET_FLAG(ifp->status, ZEBRA_INTERFACE_LINKDETECTION);
+
if (if_master.if_new_hook)
(*if_master.if_new_hook) (ifp);
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c
index d54bc47..8755c08 100644
--- a/ospfd/ospf_interface.c
+++ b/ospfd/ospf_interface.c
@@ -866,6 +866,9 @@
snprintf (ifname, sizeof(ifname), "VLINK%d", vlink_count);
vi = if_create (ifname, strnlen(ifname, sizeof(ifname)));
+ /* Ensure that linkdetection is not enabled on the stub interfaces
+ * created for OSPF virtual links. */
+ UNSET_FLAG(vi->status, ZEBRA_INTERFACE_LINKDETECTION);
co = connected_new ();
co->ifp = vi;
listnode_add (vi->connected, co);