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

[mirror_frr.git] / pimd / pim_ifchannel.h

diff --git a/pimd/pim_ifchannel.h b/pimd/pim_ifchannel.h
index 2260fd451b9b73182ef499e4b5382ca7a974978d..b9d4d291d854d910aeb96bd58048878b1786050d 100644 (file)
--- a/pimd/pim_ifchannel.h
+++ b/pimd/pim_ifchannel.h
@@ -80,6 +80,8 @@ struct pim_assert_metric {
   Per-interface (S,G) state
 */
 struct pim_ifchannel {
+       RB_ENTRY(rb_ifchannel) pim_ifp_rb;
+
        struct pim_ifchannel *parent;
        struct list *sources;
        struct prefix_sg sg;
@@ -108,7 +110,10 @@ struct pim_ifchannel {
        struct pim_upstream *upstream;
 };
 
-void pim_ifchannel_free(struct pim_ifchannel *ch);
+RB_HEAD(pim_ifchannel_rb, pim_ifchannel);
+RB_PROTOTYPE(pim_ifchannel_rb, pim_ifchannel, pim_ifp_rb,
+            pim_ifchannel_compare);
+
 void pim_ifchannel_delete(struct pim_ifchannel *ch);
 void pim_ifchannel_delete_all(struct interface *ifp);
 void pim_ifchannel_membership_clear(struct interface *ifp);
@@ -116,7 +121,8 @@ void pim_ifchannel_delete_on_noinfo(struct interface *ifp);
 struct pim_ifchannel *pim_ifchannel_find(struct interface *ifp,
                                         struct prefix_sg *sg);
 struct pim_ifchannel *pim_ifchannel_add(struct interface *ifp,
-                                       struct prefix_sg *sg, int flags);
+                                       struct prefix_sg *sg, uint8_t ch_flags,
+                                       int up_flags);
 void pim_ifchannel_join_add(struct interface *ifp, struct in_addr neigh_addr,
                            struct in_addr upstream, struct prefix_sg *sg,
                            uint8_t source_flags, uint16_t holdtime);
@@ -144,11 +150,10 @@ void pim_ifchannel_update_assert_tracking_desired(struct pim_ifchannel *ch);
 
 void pim_ifchannel_scan_forward_start(struct interface *new_ifp);
 void pim_ifchannel_set_star_g_join_state(struct pim_ifchannel *ch, int eom,
-                                        uint8_t source_flags, uint8_t join,
-                                        uint8_t starg_alone);
+                                        uint8_t join);
 
-int pim_ifchannel_compare(struct pim_ifchannel *ch1, struct pim_ifchannel *ch2);
+int pim_ifchannel_compare(const struct pim_ifchannel *ch1,
+                         const struct pim_ifchannel *ch2);
 
 unsigned int pim_ifchannel_hash_key(void *arg);
-int pim_ifchannel_equal(const void *arg1, const void *arg2);
 #endif /* PIM_IFCHANNEL_H */