From: Dinesh G Dutt <[email protected]> Signed-off-by: Roopa Prabhu <[email protected]> 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 <[email protected]> Acked-By: [email protected] --- NEWS | 6 ++++++ lib/if.c | 3 +++ ospfd/ospf_interface.c | 3 +++ 3 files changed, 12 insertions(+) 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 44b8586..e4e8efa 100644 --- a/lib/if.c +++ b/lib/if.c @@ -135,6 +135,9 @@ if_create_vrf (const char *name, int namelen, vrf_id_t vrf_id) 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 f4242b0..4a5f60f 100644 --- a/ospfd/ospf_interface.c +++ b/ospfd/ospf_interface.c @@ -866,6 +866,9 @@ 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))); + /* 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); -- 2.5.5 _______________________________________________ Quagga-dev mailing list [email protected] https://lists.quagga.net/mailman/listinfo/quagga-dev
