2005-09-17 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

	* ospf_opaque.c:
	  (ospf_opaque_lsa_refresh_schedule,ospf_opaque_lsa_flush_schedule)
	  No need to call ospf_lookup(), just use lsa0->area->ospf instead.

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 07e2b15b2d541cf06490073735c3b9997aeff9db..bc37d507461d2042994957093ce0d990a5f0e2f0 100644 (file)
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-17 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+       * ospf_opaque.c:
+         (ospf_opaque_lsa_refresh_schedule,ospf_opaque_lsa_flush_schedule)
+         No need to call ospf_lookup(), just use lsa0->area->ospf instead.
+
 2005-08-21 Hasso Tepper <hasso at quagga.net>
 
        * ospf_vty.c: Make "show ip ospf neighbor xxx" commands work.

diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c
index 8eca9eeaacb8405dc353cd77a5d4b0e3ccfa86fe..f2496cfd73dadc9aed175667b308f42dd06d518f 100644 (file)
--- a/ospfd/ospf_opaque.c
+++ b/ospfd/ospf_opaque.c
@@ -1982,14 +1982,11 @@ out:
 void
 ospf_opaque_lsa_refresh_schedule (struct ospf_lsa *lsa0)
 {
-  struct ospf *ospf = ospf;
   struct opaque_info_per_type *oipt;
   struct opaque_info_per_id *oipi;
   struct ospf_lsa *lsa;
   int delay;
 
-  ospf = ospf_lookup ();
-
   if ((oipt = lookup_opaque_info_by_type (lsa0)) == NULL
   ||  (oipi = lookup_opaque_info_by_id (oipt, lsa0)) == NULL)
     {
@@ -2019,7 +2016,7 @@ ospf_opaque_lsa_refresh_schedule (struct ospf_lsa *lsa0)
       ospf_ls_retransmit_delete_nbr_area (lsa->area, lsa);
       break;
     case OSPF_OPAQUE_AS_LSA:
-      ospf_ls_retransmit_delete_nbr_as (ospf, lsa);
+      ospf_ls_retransmit_delete_nbr_as (lsa0->area->ospf, lsa);
       break;
     default:
       zlog_warn ("ospf_opaque_lsa_refresh_schedule: Unexpected LSA-type(%u)", lsa->data->type);
@@ -2061,13 +2058,10 @@ ospf_opaque_lsa_refresh_timer (struct thread *t)
 void
 ospf_opaque_lsa_flush_schedule (struct ospf_lsa *lsa0)
 {
-  struct ospf *ospf = ospf;
   struct opaque_info_per_type *oipt;
   struct opaque_info_per_id *oipi;
   struct ospf_lsa *lsa;
 
-  ospf = ospf_lookup ();
-
   if ((oipt = lookup_opaque_info_by_type (lsa0)) == NULL
   ||  (oipi = lookup_opaque_info_by_id (oipt, lsa0)) == NULL)
     {
@@ -2090,7 +2084,7 @@ ospf_opaque_lsa_flush_schedule (struct ospf_lsa *lsa0)
       ospf_ls_retransmit_delete_nbr_area (lsa->area, lsa);
       break;
     case OSPF_OPAQUE_AS_LSA:
-      ospf_ls_retransmit_delete_nbr_as (ospf, lsa);
+      ospf_ls_retransmit_delete_nbr_as (lsa0->area->ospf, lsa);
       break;
     default:
       zlog_warn ("ospf_opaque_lsa_flush_schedule: Unexpected LSA-type(%u)", lsa->data->type);
@@ -2114,7 +2108,7 @@ ospf_opaque_lsa_flush_schedule (struct ospf_lsa *lsa0)
     zlog_debug ("Schedule Type-%u Opaque-LSA to FLUSH: [opaque-type=%u, opaque-id=%x]", lsa->data->type, GET_OPAQUE_TYPE (ntohl (lsa->data->id.s_addr)), GET_OPAQUE_ID (ntohl (lsa->data->id.s_addr)));
 
   /* This lsa will be flushed and removed eventually. */
-  ospf_lsa_maxage (ospf, lsa);
+  ospf_lsa_maxage (lsa0->area->ospf, lsa);
 
 out:
   return;