lib: Remove unnecessary comparison, for linked list

[mirror_frr.git] / pimd / pim_ifchannel.h

diff --git a/pimd/pim_ifchannel.h b/pimd/pim_ifchannel.h
index 7ec8191e568704d07f42277194405b8a42c60b05..0c5b6780d1bccb3b36f61249bde8d6d33c241d23 100644 (file)
--- a/pimd/pim_ifchannel.h
+++ b/pimd/pim_ifchannel.h
@@ -25,6 +25,8 @@
 #include "if.h"
 #include "prefix.h"
 
+#include "pim_assert.h"
+
 struct pim_ifchannel;
 #include "pim_upstream.h"
 
@@ -39,20 +41,6 @@ enum pim_ifjoin_state {
        PIM_IFJOIN_PRUNE_PENDING_TMP,
 };
 
-enum pim_ifassert_state {
-       PIM_IFASSERT_NOINFO,
-       PIM_IFASSERT_I_AM_WINNER,
-       PIM_IFASSERT_I_AM_LOSER
-};
-
-struct pim_assert_metric {
-       uint32_t rpt_bit_flag;
-       uint32_t metric_preference;
-       uint32_t route_metric;
-       struct in_addr ip_address; /* neighbor router that sourced the Assert
-                                     message */
-};
-
 /*
   Flag to detect change in CouldAssert(S,G,I)
 */
@@ -101,7 +89,7 @@ struct pim_ifchannel {
 
        struct pim_ifchannel *parent;
        struct list *sources;
-       struct prefix_sg sg;
+       pim_sgaddr sg;
        char sg_str[PIM_SG_LEN];
        struct interface *interface; /* backpointer to interface */
        uint32_t flags;
@@ -118,7 +106,7 @@ struct pim_ifchannel {
        /* Per-interface (S,G) Assert State (Section 4.6.1 of RFC4601) */
        enum pim_ifassert_state ifassert_state;
        struct thread *t_ifassert_timer;
-       struct in_addr ifassert_winner;
+       pim_addr ifassert_winner;
        struct pim_assert_metric ifassert_winner_metric;
        int64_t ifassert_creation; /* Record uptime of ifassert state */
        struct pim_assert_metric ifassert_my_metric;
@@ -135,21 +123,18 @@ void pim_ifchannel_delete(struct pim_ifchannel *ch);
 void pim_ifchannel_delete_all(struct interface *ifp);
 void pim_ifchannel_membership_clear(struct interface *ifp);
 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, 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,
+struct pim_ifchannel *pim_ifchannel_find(struct interface *ifp, pim_sgaddr *sg);
+struct pim_ifchannel *pim_ifchannel_add(struct interface *ifp, pim_sgaddr *sg,
+                                       uint8_t ch_flags, int up_flags);
+void pim_ifchannel_join_add(struct interface *ifp, pim_addr neigh_addr,
+                           pim_addr upstream, pim_sgaddr *sg,
                            uint8_t source_flags, uint16_t holdtime);
-void pim_ifchannel_prune(struct interface *ifp, struct in_addr upstream,
-                        struct prefix_sg *sg, uint8_t source_flags,
+void pim_ifchannel_prune(struct interface *ifp, pim_addr upstream,
+                        pim_sgaddr *sg, uint8_t source_flags,
                         uint16_t holdtime);
-int pim_ifchannel_local_membership_add(struct interface *ifp,
-               struct prefix_sg *sg, bool is_vxlan);
-void pim_ifchannel_local_membership_del(struct interface *ifp,
-                                       struct prefix_sg *sg);
+int pim_ifchannel_local_membership_add(struct interface *ifp, pim_sgaddr *sg,
+                                      bool is_vxlan);
+void pim_ifchannel_local_membership_del(struct interface *ifp, pim_sgaddr *sg);
 
 void pim_ifchannel_ifjoin_switch(const char *caller, struct pim_ifchannel *ch,
                                 enum pim_ifjoin_state new_state);
@@ -172,6 +157,5 @@ void pim_ifchannel_set_star_g_join_state(struct pim_ifchannel *ch, int eom,
 int pim_ifchannel_compare(const struct pim_ifchannel *ch1,
                          const struct pim_ifchannel *ch2);
 
-unsigned int pim_ifchannel_hash_key(const void *arg);
 void delete_on_noinfo(struct pim_ifchannel *ch);
 #endif /* PIM_IFCHANNEL_H */