From e05fba43875e86ba2ec6e3970e5ec3aa2d0e040c Mon Sep 17 00:00:00 2001 From: paul Date: Sun, 13 Apr 2003 20:20:53 +0000 Subject: 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->... --- ChangeLog | 5 +++++ ospfd/ospf_lsa.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8e336243..3f153293 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-04-13 Paul Jakma + + * Amir: Opaque LSA bug fix for deletion of Type11's + * configure.ac: use --localstatedir for Unix sockets + 2003-04-04 Paul Jakma * Sync to Zebra CVS diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c index d0cf56cd..0facaf08 100644 --- 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; -- cgit v1.2.1