Merge pull request #5706 from mjstapp/fix_nh_debug_show

[mirror_frr.git] / zebra / redistribute.h

diff --git a/zebra/redistribute.h b/zebra/redistribute.h
index f0dc79574cc1518600a9a0cdf99ec3804e3ec385..2685458f968753a032199a0a22bf3ad9446b00b8 100644 (file)
--- a/zebra/redistribute.h
+++ b/zebra/redistribute.h
@@ -29,6 +29,10 @@
 #include "zebra/zserv.h"
 #include "zebra/rib.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* ZAPI command handlers */
 extern void zebra_redistribute_add(ZAPI_HANDLER_ARGS);
 extern void zebra_redistribute_delete(ZAPI_HANDLER_ARGS);
@@ -38,11 +42,19 @@ extern void zebra_redistribute_default_delete(ZAPI_HANDLER_ARGS);
 
 extern void redistribute_update(const struct prefix *p,
                                const struct prefix *src_p,
-                               struct route_entry *re,
-                               struct route_entry *prev_re);
-extern void redistribute_delete(const struct prefix *p,
-                               const struct prefix *src_p,
-                               struct route_entry *re);
+                               const struct route_entry *re,
+                               const struct route_entry *prev_re);
+/*
+ * During a route delete, where 'new_re' is NULL, redist a delete to all
+ * clients registered for the type of 'old_re'.
+ * During a route update, redist a delete to any clients who will not see
+ * an update when the new route is installed. There are cases when a client
+ * may have seen a redist for 'old_re', but will not see
+ * the redist for 'new_re'.
+ */
+void redistribute_delete(const struct prefix *p, const struct prefix *src_p,
+                        const struct route_entry *old_re,
+                        const struct route_entry *new_re);
 
 extern void zebra_interface_up_update(struct interface *);
 extern void zebra_interface_down_update(struct interface *);
@@ -60,17 +72,26 @@ extern void zebra_interface_vrf_update_del(struct interface *,
 extern void zebra_interface_vrf_update_add(struct interface *,
                                           vrf_id_t old_vrf_id);
 
-extern int zebra_import_table(afi_t afi, uint32_t table_id, uint32_t distance,
+extern int zebra_import_table(afi_t afi, vrf_id_t vrf_id,
+                             uint32_t table_id, uint32_t distance,
                              const char *rmap_name, int add);
 
-extern int zebra_add_import_table_entry(struct route_node *rn,
+extern int zebra_add_import_table_entry(struct zebra_vrf *zvrf,
+                                       struct route_node *rn,
                                        struct route_entry *re,
                                        const char *rmap_name);
-extern int zebra_del_import_table_entry(struct route_node *rn,
+extern int zebra_del_import_table_entry(struct zebra_vrf *zvrf,
+                                       struct route_node *rn,
                                        struct route_entry *re);
-extern int is_zebra_import_table_enabled(afi_t, uint32_t table_id);
+extern int is_zebra_import_table_enabled(afi_t, vrf_id_t vrf_id,
+                                        uint32_t table_id);
 
-extern int zebra_import_table_config(struct vty *);
+extern int zebra_import_table_config(struct vty *, vrf_id_t vrf_id);
 
 extern void zebra_import_table_rm_update(const char *rmap);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _ZEBRA_REDISTRIBUTE_H */