Merge pull request #7974 from donaldsharp/more_if_zero

[mirror_frr.git] / ospf6d / ospf6_abr.h

diff --git a/ospf6d/ospf6_abr.h b/ospf6d/ospf6_abr.h
index 61a6a734202d263ffe26827db5fd8eda4051ba6b..25a73f9203943953d4f5f2bedd4e62962d0c87f6 100644 (file)
--- a/ospf6d/ospf6_abr.h
+++ b/ospf6d/ospf6_abr.h
@@ -35,17 +35,17 @@ extern unsigned char conf_debug_ospf6_abr;
 /* Inter-Area-Prefix-LSA */
 #define OSPF6_INTER_PREFIX_LSA_MIN_SIZE        4U /* w/o IPv6 prefix */
 struct ospf6_inter_prefix_lsa {
-       u_int32_t metric;
+       uint32_t metric;
        struct ospf6_prefix prefix;
 };
 
 /* Inter-Area-Router-LSA */
 #define OSPF6_INTER_ROUTER_LSA_FIX_SIZE       12U
 struct ospf6_inter_router_lsa {
-       u_char mbz;
-       u_char options[3];
-       u_int32_t metric;
-       u_int32_t router_id;
+       uint8_t mbz;
+       uint8_t options[3];
+       uint32_t metric;
+       uint32_t router_id;
 };
 
 #define OSPF6_ABR_SUMMARY_METRIC(E) (ntohl ((E)->metric & htonl (0x00ffffff)))
@@ -64,11 +64,14 @@ extern void ospf6_abr_disable_area(struct ospf6_area *oa);
 
 extern int ospf6_abr_originate_summary_to_area(struct ospf6_route *route,
                                               struct ospf6_area *area);
-extern void ospf6_abr_originate_summary(struct ospf6_route *route);
+extern void ospf6_abr_originate_summary(struct ospf6_route *route,
+                                       struct ospf6 *ospf6);
 extern void ospf6_abr_examin_summary(struct ospf6_lsa *lsa,
                                     struct ospf6_area *oa);
-extern void ospf6_abr_defaults_to_stub(struct ospf6 *);
-extern void ospf6_abr_examin_brouter(u_int32_t router_id);
+extern void ospf6_abr_defaults_to_stub(struct ospf6 *ospf6);
+extern void ospf6_abr_examin_brouter(uint32_t router_id,
+                                    struct ospf6_route *route,
+                                    struct ospf6 *ospf6);
 extern void ospf6_abr_reimport(struct ospf6_area *oa);
 extern void ospf6_abr_range_reset_cost(struct ospf6 *ospf6);
 extern void ospf6_abr_prefix_resummarize(struct ospf6 *ospf6);
@@ -76,7 +79,12 @@ extern void ospf6_abr_prefix_resummarize(struct ospf6 *ospf6);
 extern int config_write_ospf6_debug_abr(struct vty *vty);
 extern void install_element_ospf6_debug_abr(void);
 extern int ospf6_abr_config_write(struct vty *vty);
-
+extern void ospf6_abr_old_route_remove(struct ospf6_lsa *lsa,
+                                      struct ospf6_route *old,
+                                      struct ospf6_route_table *table);
+extern void ospf6_abr_old_path_update(struct ospf6_route *old_route,
+                                     struct ospf6_route *route,
+                                     struct ospf6_route_table *table);
 extern void ospf6_abr_init(void);
 
 #endif /*OSPF6_ABR_H*/