summaryrefslogtreecommitdiff
path: root/ospfd/ospf_abr.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2013-01-11 21:46:18 +0100
committerDavid Lamparter <equinox@opensourcerouting.org>2013-01-11 21:46:22 +0100
commitb2e5bdbe10c4145f508fcf1486ffe29d5ce516f7 (patch)
treefae70e8c1580d99fee0c2a59d6bef831c4c9465c /ospfd/ospf_abr.c
parenta16dcf7c11d80775b07a0fa6f3ac5527190fb486 (diff)
parente0630cb4d61557f956318a088f68f1fc4d261ef3 (diff)
Merge remote-tracking branch 'savannah/sf/ospfd'
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ospfd/ospf_abr.c')
-rw-r--r--ospfd/ospf_abr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ospfd/ospf_abr.c b/ospfd/ospf_abr.c
index f5edc99e..4770275d 100644
--- a/ospfd/ospf_abr.c
+++ b/ospfd/ospf_abr.c
@@ -1140,7 +1140,8 @@ ospf_abr_announce_rtr_to_area (struct prefix_ipv4 *p, u_int32_t cost,
GET_METRIC (slsa->metric), cost);
}
- if (old && (GET_METRIC (slsa->metric) == cost))
+ if (old && (GET_METRIC (slsa->metric) == cost) &&
+ ((old->flags & OSPF_LSA_IN_MAXAGE) == 0))
{
if (IS_DEBUG_OSPF_EVENT)
zlog_debug ("ospf_abr_announce_rtr_to_area(): old summary approved");