From: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Date: Fri, 7 Aug 2009 11:48:15 +0000 (+0200)
Subject: ospfd: Tighten up the connected check for redistribution
X-Git-Tag: frr-2.0-rc1~2211
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=5d8de93a84b2afc4202d3284eb9e57672e2551b3;p=mirror%2Ffrr.git

ospfd: Tighten up the connected check for redistribution

* ospf_zebra.c: (ospf_distribute_check_connected) check to make filter out
  routes matching connected routes was matching against OSPF networks, which
  can be far more general than the actual connected interfaces. Fix.
---

diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c
index 52b23fe83f..6f0a71ff51 100644
--- a/ospfd/ospf_zebra.c
+++ b/ospfd/ospf_zebra.c
@@ -682,16 +682,13 @@ ospf_external_lsa_originate_check (struct ospf *ospf,
 int
 ospf_distribute_check_connected (struct ospf *ospf, struct external_info *ei)
 {
-  struct route_node *rn;
+  struct listnode *node;
+  struct ospf_interface *oi;
 
-  for (rn = route_top (ospf->networks); rn; rn = route_next (rn))
-    if (rn->info != NULL)
-      if (prefix_match (&rn->p, (struct prefix *) &ei->p))
-        {
-          route_unlock_node (rn);
-          return 0;
-        }
 
+  for (ALL_LIST_ELEMENTS_RO (ospf->oiflist, node, oi))
+      if (prefix_match (oi->address, (struct prefix *) &ei->p))
+          return 0;
   return 1;
 }