[ospfd] misc small fixes. Fix default stub router setting. no opaque compile.
2005-11-14 Paul Jakma <paul.jakma@sun.com>
* ospfd.c: (ospf_new) stub-shutdown should just default to
unconfigured, too strange otherwise.
(ospf_finish_final) t_opaque_lsa_self TIMER_OFF should be
preprocessor conditional on HAVE_OPAQUE_LSA.
* ospfd.h: (struct ospf) remove the SHUTDOWN_DEFAULT define.
no longer used, plus it wasn't in range that the command
accepted.
* ospf_zebra.h: Depends on vty.h, include it.
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 751f5d3..825b92c 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,14 @@
+2005-11-14 Paul Jakma <paul.jakma@sun.com>
+
+ * ospfd.c: (ospf_new) stub-shutdown should just default to
+ unconfigured, too strange otherwise.
+ (ospf_finish_final) t_opaque_lsa_self TIMER_OFF should be
+ preprocessor conditional on HAVE_OPAQUE_LSA.
+ * ospfd.h: (struct ospf) remove the SHUTDOWN_DEFAULT define.
+ no longer used, plus it wasn't in range that the command
+ accepted.
+ * ospf_zebra.h: Depends on vty.h, include it.
+
2005-11-11 Paul Jakma <paul.jakma@sun.com>
* ospf_spf.c: (ospf_canonical_nexthops_free) Free only
diff --git a/ospfd/ospf_zebra.h b/ospfd/ospf_zebra.h
index 7fe87b7..3efd895 100644
--- a/ospfd/ospf_zebra.h
+++ b/ospfd/ospf_zebra.h
@@ -23,6 +23,8 @@
#ifndef _ZEBRA_OSPF_ZEBRA_H
#define _ZEBRA_OSPF_ZEBRA_H
+#include "vty.h"
+
#define EXTERNAL_METRIC_TYPE_1 0
#define EXTERNAL_METRIC_TYPE_2 1
diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index 69f091d..3cc0202 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -175,7 +175,7 @@
new->external_lsas = route_table_init ();
new->stub_router_startup_time = OSPF_STUB_ROUTER_UNCONFIGURED;
- new->stub_router_shutdown_time = OSPF_STUB_ROUTER_SHUTDOWN_DEFAULT;
+ new->stub_router_shutdown_time = OSPF_STUB_ROUTER_UNCONFIGURED;
/* Distribute parameter init. */
for (i = 0; i <= ZEBRA_ROUTE_MAX; i++)
@@ -466,7 +466,9 @@
OSPF_TIMER_OFF (ospf->t_lsa_refresher);
OSPF_TIMER_OFF (ospf->t_read);
OSPF_TIMER_OFF (ospf->t_write);
+#ifdef HAVE_OPAQUE_LSA
OSPF_TIMER_OFF (ospf->t_opaque_lsa_self);
+#endif
close (ospf->fd);
stream_free(ospf->ibuf);
diff --git a/ospfd/ospfd.h b/ospfd/ospfd.h
index ed66ebf..ff27a32 100644
--- a/ospfd/ospfd.h
+++ b/ospfd/ospfd.h
@@ -198,7 +198,6 @@
unsigned int stub_router_startup_time; /* seconds */
unsigned int stub_router_shutdown_time; /* seconds */
#define OSPF_STUB_ROUTER_UNCONFIGURED 0
-#define OSPF_STUB_ROUTER_SHUTDOWN_DEFAULT 2
/* SPF parameters */
unsigned int spf_delay; /* SPF delay time. */