summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorajs <ajs>2005-09-17 18:53:38 +0000
committerajs <ajs>2005-09-17 18:53:38 +0000
commite6a0bf9ca05b5543d0d21045ce939598c4e79887 (patch)
tree9ca8e935ef9884e22afd3e046242e334917ff24a
parenta96d8d1095da09811e343a534f5801a948ae1061 (diff)
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.
-rw-r--r--ospfd/ChangeLog6
-rw-r--r--ospfd/ospf_opaque.c12
2 files changed, 9 insertions, 9 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 07e2b15b..bc37d507 100644
--- 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 8eca9eea..f2496cfd 100644
--- 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;