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

[mirror_frr.git] / ospfd / ospf_abr.h

diff --git a/ospfd/ospf_abr.h b/ospfd/ospf_abr.h
index 71eb71bdce59564070b73d0c80114dfdb1ec3ec2..b3007622c4e1b8f869c179ae786785fd3a3c8bc3 100644 (file)
--- a/ospfd/ospf_abr.h
+++ b/ospfd/ospf_abr.h
@@ -28,65 +28,59 @@
 #define OSPF_AREA_RANGE_SUBSTITUTE     (1 << 1)
 
 /* Area range. */
-struct ospf_area_range
-{
-  /* Area range address. */
-  struct in_addr addr;
+struct ospf_area_range {
+       /* Area range address. */
+       struct in_addr addr;
 
-  /* Area range masklen. */
-  u_char masklen;
+       /* Area range masklen. */
+       uint8_t masklen;
 
-  /* Flags. */
-  u_char flags;
+       /* Flags. */
+       uint8_t flags;
 
-  /* Number of more specific prefixes. */
-  int specifics;
+       /* Number of more specific prefixes. */
+       int specifics;
 
-  /* Addr and masklen to substitute. */
-  struct in_addr subst_addr;
-  u_char subst_masklen;
+       /* Addr and masklen to substitute. */
+       struct in_addr subst_addr;
+       uint8_t subst_masklen;
 
-  /* Range cost. */
-  u_int32_t cost;
+       /* Range cost. */
+       uint32_t cost;
 
-  /* Configured range cost. */
-  u_int32_t cost_config;
+       /* Configured range cost. */
+       uint32_t cost_config;
 };
 
 /* Prototypes. */
-extern struct ospf_area_range *ospf_area_range_lookup (struct ospf_area *,
-                                                      struct prefix_ipv4 *);
-
-extern struct ospf_area_range *ospf_some_area_range_match (struct prefix_ipv4
-                                                          *);
-
-extern struct ospf_area_range *ospf_area_range_lookup_next (struct ospf_area
-                                                           *,
-                                                           struct in_addr *,
-                                                           int);
-
-extern int ospf_area_range_set (struct ospf *, struct in_addr,
-                               struct prefix_ipv4 *, int);
-extern int ospf_area_range_cost_set (struct ospf *, struct in_addr,
-                                    struct prefix_ipv4 *, u_int32_t);
-extern int ospf_area_range_unset (struct ospf *, struct in_addr,
-                                 struct prefix_ipv4 *);
-extern int ospf_area_range_substitute_set (struct ospf *, struct in_addr,
-                                          struct prefix_ipv4 *,
-                                          struct prefix_ipv4 *);
-extern int ospf_area_range_substitute_unset (struct ospf *, struct in_addr,
-                                            struct prefix_ipv4 *);
-extern struct ospf_area_range *ospf_area_range_match_any (struct ospf *,
-                                                         struct prefix_ipv4
-                                                         *);
-extern int ospf_area_range_active (struct ospf_area_range *);
-extern int ospf_act_bb_connection (struct ospf *);
-
-extern void ospf_check_abr_status (struct ospf *);
-extern void ospf_abr_task (struct ospf *);
-extern void ospf_schedule_abr_task (struct ospf *);
-
-extern void ospf_abr_announce_network_to_area (struct prefix_ipv4 *, 
-                                               u_int32_t,
-                                               struct ospf_area *);
+extern struct ospf_area_range *ospf_area_range_lookup(struct ospf_area *,
+                                                     struct prefix_ipv4 *);
+
+extern struct ospf_area_range *ospf_some_area_range_match(struct prefix_ipv4 *);
+
+extern struct ospf_area_range *
+ospf_area_range_lookup_next(struct ospf_area *, struct in_addr *, int);
+
+extern int ospf_area_range_set(struct ospf *, struct in_addr,
+                              struct prefix_ipv4 *, int);
+extern int ospf_area_range_cost_set(struct ospf *, struct in_addr,
+                                   struct prefix_ipv4 *, uint32_t);
+extern int ospf_area_range_unset(struct ospf *, struct in_addr,
+                                struct prefix_ipv4 *);
+extern int ospf_area_range_substitute_set(struct ospf *, struct in_addr,
+                                         struct prefix_ipv4 *,
+                                         struct prefix_ipv4 *);
+extern int ospf_area_range_substitute_unset(struct ospf *, struct in_addr,
+                                           struct prefix_ipv4 *);
+extern struct ospf_area_range *ospf_area_range_match_any(struct ospf *,
+                                                        struct prefix_ipv4 *);
+extern int ospf_area_range_active(struct ospf_area_range *);
+extern int ospf_act_bb_connection(struct ospf *);
+
+extern void ospf_check_abr_status(struct ospf *);
+extern void ospf_abr_task(struct ospf *);
+extern void ospf_schedule_abr_task(struct ospf *);
+
+extern void ospf_abr_announce_network_to_area(struct prefix_ipv4 *, uint32_t,
+                                             struct ospf_area *);
 #endif /* _ZEBRA_OSPF_ABR_H */