Merge pull request #5549 from donaldsharp/automated

[mirror_frr.git] / ospfd / ospf_lsa.h

diff --git a/ospfd/ospf_lsa.h b/ospfd/ospf_lsa.h
index a381cf7145fd3a2fc123321567f2d3c8af4ac670..4033659bffbe8ae2095400db45642a265a35dc0b 100644 (file)
--- a/ospfd/ospf_lsa.h
+++ b/ospfd/ospf_lsa.h
@@ -69,6 +69,8 @@ struct lsa_header {
        uint16_t length;
 };
 
+struct vertex;
+
 /* OSPF LSA. */
 struct ospf_lsa {
        /* LSA origination flag. */
@@ -95,10 +97,7 @@ struct ospf_lsa {
        int lock;
 
        /* Flags for the SPF calculation. */
-       int stat;
-#define LSA_SPF_NOT_EXPLORED -1
-#define LSA_SPF_IN_SPFTREE -2
-       /* If stat >= 0, stat is LSA position in candidates heap. */
+       struct vertex *stat;
 
        /* References to this LSA in neighbor retransmission lists*/
        int retransmit_counter;
@@ -276,8 +275,7 @@ extern struct in_addr ospf_get_ip_from_ifp(struct ospf_interface *);
 
 extern struct ospf_lsa *ospf_external_lsa_originate(struct ospf *,
                                                    struct external_info *);
-extern int ospf_external_lsa_originate_timer(struct thread *);
-extern int ospf_default_originate_timer(struct thread *);
+extern void ospf_external_lsa_rid_change(struct ospf *ospf);
 extern struct ospf_lsa *ospf_lsa_lookup(struct ospf *ospf, struct ospf_area *,
                                        uint32_t, struct in_addr,
                                        struct in_addr);
@@ -302,7 +300,6 @@ extern int ospf_lsa_maxage_walker(struct thread *);
 extern struct ospf_lsa *ospf_lsa_refresh(struct ospf *, struct ospf_lsa *);
 
 extern void ospf_external_lsa_refresh_default(struct ospf *);
-extern void ospf_default_originate_lsa_update(struct ospf *ospf);
 
 extern void ospf_external_lsa_refresh_type(struct ospf *, uint8_t,
                                           unsigned short, int);