zebra: Allow ns delete to happen after under/over flow checks

[mirror_frr.git] / ospf6d / ospf6_top.h

diff --git a/ospf6d/ospf6_top.h b/ospf6d/ospf6_top.h
index d7a3766b80498676b255c183f66c2d9473a0d16c..381027dcff26c60eb13fd83bbb1773a03e644e4d 100644 (file)
--- a/ospf6d/ospf6_top.h
+++ b/ospf6d/ospf6_top.h
@@ -24,13 +24,18 @@
 #include "qobj.h"
 #include "routemap.h"
 
+struct ospf6_master {
+
+       uint32_t zebra_router_id;
+};
+
 /* OSPFv3 top level data structure */
 struct ospf6 {
        /* my router id */
-       u_int32_t router_id;
+       uint32_t router_id;
 
        /* static router id */
-       u_int32_t router_id_static;
+       uint32_t router_id_static;
 
        struct in_addr router_id_zebra;
 
@@ -50,7 +55,7 @@ struct ospf6 {
 
        struct ospf6_route_table *external_table;
        struct route_table *external_id_table;
-       u_int32_t external_id;
+       uint32_t external_id;
 
        /* redistribute route-map */
        struct {
@@ -58,10 +63,10 @@ struct ospf6 {
                struct route_map *map;
        } rmap[ZEBRA_ROUTE_MAX];
 
-       u_char flag;
+       uint8_t flag;
 
        /* Configured flags */
-       u_char config_flags;
+       uint8_t config_flags;
 #define OSPF6_LOG_ADJACENCY_CHANGES      (1 << 0)
 #define OSPF6_LOG_ADJACENCY_DETAIL       (1 << 1)
 
@@ -86,13 +91,13 @@ struct ospf6 {
        struct thread *maxage_remover;
        struct thread *t_distribute_update; /* Distirbute update timer. */
 
-       u_int32_t ref_bandwidth;
+       uint32_t ref_bandwidth;
 
        /* Distance parameters */
-       u_char distance_all;
-       u_char distance_intra;
-       u_char distance_inter;
-       u_char distance_external;
+       uint8_t distance_all;
+       uint8_t distance_intra;
+       uint8_t distance_inter;
+       uint8_t distance_external;
 
        struct route_table *distance_table;
 
@@ -109,10 +114,13 @@ DECLARE_QOBJ_TYPE(ospf6)
 
 /* global pointer for OSPF top data structure */
 extern struct ospf6 *ospf6;
+extern struct ospf6_master *om6;
 
 /* prototypes */
+extern void ospf6_master_init(void);
 extern void ospf6_top_init(void);
 extern void ospf6_delete(struct ospf6 *o);
+extern void ospf6_router_id_update(void);
 
 extern void ospf6_maxage_remove(struct ospf6 *o);