--- embedaddon/quagga/ospfd/ospf_lsa.h	2013/07/21 23:54:40	1.1.1.4
+++ embedaddon/quagga/ospfd/ospf_lsa.h	2016/11/02 10:09:12	1.1.1.5
@@ -27,11 +27,7 @@
 
 /* OSPF LSA Range definition. */
 #define OSPF_MIN_LSA		1  /* begin range here */
-#if defined (HAVE_OPAQUE_LSA)
 #define OSPF_MAX_LSA           12
-#else
-#define OSPF_MAX_LSA		8
-#endif
 
 /* OSPF LSA Type definition. */
 #define OSPF_UNKNOWN_LSA	      0
@@ -211,9 +207,7 @@ struct as_external_lsa
   } e[1];
 };
 
-#ifdef HAVE_OPAQUE_LSA
 #include "ospfd/ospf_opaque.h"
-#endif /* HAVE_OPAQUE_LSA */
 
 /* Macros. */
 #define GET_METRIC(x) get_metric(x)
@@ -237,6 +231,7 @@ extern struct timeval tv_adjust (struct timeval);
 extern int tv_ceil (struct timeval);
 extern int tv_floor (struct timeval);
 extern struct timeval int2tv (int);
+extern struct timeval msec2tv (int);
 extern struct timeval tv_add (struct timeval, struct timeval);
 extern struct timeval tv_sub (struct timeval, struct timeval);
 extern int tv_cmp (struct timeval, struct timeval);
@@ -251,6 +246,7 @@ extern u_int32_t lsa_seqnum_increment (struct ospf_lsa
 extern void lsa_header_set (struct stream *, u_char, u_char, struct in_addr,
 		     struct in_addr);
 extern struct ospf_neighbor *ospf_nbr_lookup_ptop (struct ospf_interface *);
+extern int ospf_check_nbr_status (struct ospf *);
 
 /* Prototype for LSA primitive. */
 extern struct ospf_lsa *ospf_lsa_new (void);
@@ -281,7 +277,7 @@ extern struct ospf_lsa *ospf_lsa_install (struct ospf 
 
 extern void ospf_nssa_lsa_flush (struct ospf *ospf, struct prefix_ipv4 *p);
 extern void ospf_external_lsa_flush (struct ospf *, u_char, struct prefix_ipv4 *,
-			      unsigned int /* , struct in_addr nexthop */);
+			             ifindex_t /* , struct in_addr nexthop */);
 
 extern struct in_addr ospf_get_ip_from_ifp (struct ospf_interface *);