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

[mirror_frr.git] / ripngd / ripng_route.h

diff --git a/ripngd/ripng_route.h b/ripngd/ripng_route.h
index 90dae04700727b73496e257da5f8d672c237b6e2..e402f4a66c850a7016eb097cadb30ec64ea4049b 100644 (file)
--- a/ripngd/ripng_route.h
+++ b/ripngd/ripng_route.h
@@ -22,35 +22,34 @@
 #ifndef _ZEBRA_RIPNG_ROUTE_H
 #define _ZEBRA_RIPNG_ROUTE_H
 
-struct ripng_aggregate
-{
-  /* Aggregate route count. */
-  unsigned int count;
+struct ripng_aggregate {
+       /* Aggregate route count. */
+       unsigned int count;
 
-  /* Suppressed route count. */
-  unsigned int suppress;
+       /* Suppressed route count. */
+       unsigned int suppress;
 
-  /* Metric of this route.  */
-  u_char metric;               
+       /* Metric of this route.  */
+       uint8_t metric;
 
-  /* Tag field of RIPng packet.*/
-  u_int16_t tag;
+       /* Tag field of RIPng packet.*/
+       uint16_t tag;
 
-  /* Route-map futures - this variables can be changed. */
-  struct in6_addr nexthop_out;
-  u_char metric_set;
-  u_char metric_out;
-  u_int16_t tag_out;
+       /* Route-map futures - this variables can be changed. */
+       struct in6_addr nexthop_out;
+       uint8_t metric_set;
+       uint8_t metric_out;
+       uint16_t tag_out;
 };
 
-extern void ripng_aggregate_increment (struct route_node *rp,
-                                       struct ripng_info *rinfo);
-extern void ripng_aggregate_decrement (struct route_node *rp,
-                                       struct ripng_info *rinfo);
-extern void ripng_aggregate_decrement_list (struct route_node *rp,
-                                       struct list *list);
-extern int ripng_aggregate_add (struct prefix *p);
-extern int ripng_aggregate_delete (struct prefix *p);
-extern void ripng_aggregate_free (struct ripng_aggregate *aggregate);
+extern void ripng_aggregate_increment(struct agg_node *rp,
+                                     struct ripng_info *rinfo);
+extern void ripng_aggregate_decrement(struct agg_node *rp,
+                                     struct ripng_info *rinfo);
+extern void ripng_aggregate_decrement_list(struct agg_node *rp,
+                                          struct list *list);
+extern int ripng_aggregate_add(struct prefix *p);
+extern int ripng_aggregate_delete(struct prefix *p);
+extern void ripng_aggregate_free(struct ripng_aggregate *aggregate);
 
 #endif /* _ZEBRA_RIPNG_ROUTE_H */