From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 23 Mar 2016 13:20:22 +0000 (-0700)
Subject: Revert "Fixes Quagga Bugzilla #842 - ospfd uses non-zero metric when describing loopb... 
X-Git-Tag: frr-2.0-rc1~1043
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b359768d2279f9d44858e9eadb410a30d1edbe4d;p=mirror%2Ffrr.git

Revert "Fixes Quagga Bugzilla #842 - ospfd uses non-zero metric when describing loopback addresses"

This reverts commit a7928d3ac43b9bd892280f8b12f73d269b8266a8.

This code change breaks allot of tests that have hard coded the
distance.  We'll unrevert this after the 3.0 release window.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index 1bf3e9e97a..fc862966b2 100644
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -639,7 +639,7 @@ lsa_link_loopback_set (struct stream *s, struct ospf_interface *oi)
 
   mask.s_addr = 0xffffffff;
   id.s_addr = oi->address->u.prefix4.s_addr;
-  return link_info_set (s, id, mask, LSA_LINK_TYPE_STUB, 0, 0);
+  return link_info_set (s, id, mask, LSA_LINK_TYPE_STUB, 0, oi->output_cost);
 }
 
 /* Describe Virtual Link. */