Author: amir

Date: 2003-04-10 14:32:31 +0200 (Thu, 10 Apr 2003)
New Revision: 212

Modified:
   zebra-ag/trunk/ospfd/ospf_lsa.c
Log:
I've fixed a small opaque lsa bug which got triggered when deleting opaque
lsa of type 11. It used area->ospf->.. when area was null. This was replaced
by a ospf = ospf_lookyp(); ospf->...

diff --git a/ChangeLog b/ChangeLog
index 8e33624342b8f7c07f8a377d77715e2653751d8b..3f153293b1873ac0f6a99f8a0c22c3be0b7844fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-13 Paul Jakma <paul@dishone.st>
+
+       * Amir: Opaque LSA bug fix for deletion of Type11's
+       * configure.ac: use --localstatedir for Unix sockets
+
 2003-04-04 Paul Jakma <paul@dishone.st>
 
        * Sync to Zebra CVS

diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index d0cf56cd5f70dc192e030222907558910c854f44..0facaf0871152440b3fe7ef13e20a237d5f0c4a3 100644 (file)
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -2678,6 +2678,9 @@ struct ospf_lsa *
 ospf_lsa_lookup (struct ospf_area *area, u_int32_t type,
                  struct in_addr id, struct in_addr adv_router)
 {
+  struct ospf *ospf = ospf_lookup();
+  assert(ospf);
+
   switch (type)
     {
     case OSPF_ROUTER_LSA:
@@ -2697,7 +2700,7 @@ ospf_lsa_lookup (struct ospf_area *area, u_int32_t type,
 #ifdef HAVE_OPAQUE_LSA
     case OSPF_OPAQUE_AS_LSA:
 #endif /* HAVE_OPAQUE_LSA */
-      return ospf_lsdb_lookup_by_id (area->ospf->lsdb, type, id, adv_router);
+      return ospf_lsdb_lookup_by_id (ospf->lsdb, type, id, adv_router);
       break;
     default:
       break;