pimd: Modify in_addr to pim_addr in pim_assert_metric

This change is to accomodate IPv6 and IPv4 in the same code.
Based on pimd or pim6d, this will be compiled.
Reviewed-by: Sarita Patra <saritap@vmware.com>
Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>

diff --git a/pimd/pim_assert.c b/pimd/pim_assert.c
index cac319468106a92a78254ef60e8164b93fcd6606..a335bc8c1a3125730678f7d1c34b935d8bfbea9a 100644 (file)
--- a/pimd/pim_assert.c
+++ b/pimd/pim_assert.c
@@ -65,9 +65,9 @@ void pim_ifassert_winner_set(struct pim_ifchannel *ch,
                        char was_str[INET_ADDRSTRLEN];
                        char winner_str[INET_ADDRSTRLEN];
                        pim_inet4_dump("<was?>", ch->ifassert_winner, was_str,
-                                     sizeof(was_str));
+                                      sizeof(was_str));
                        pim_inet4_dump("<winner?>", winner, winner_str,
-                                     sizeof(winner_str));
+                                      sizeof(winner_str));
                        zlog_debug(
                                "%s: (S,G)=%s assert winner changed from %s to %s on interface %s",
                                __func__, ch->sg_str, was_str, winner_str,
@@ -339,7 +339,7 @@ int pim_assert_metric_better(const struct pim_assert_metric *m1,
        if (m1->route_metric > m2->route_metric)
                return 0;
 
-       return ntohl(m1->ip_address.s_addr) > ntohl(m2->ip_address.s_addr);
+       return pim_addr_cmp(m1->ip_address, m2->ip_address) > 0;
 }
 
 int pim_assert_metric_match(const struct pim_assert_metric *m1,
@@ -352,7 +352,7 @@ int pim_assert_metric_match(const struct pim_assert_metric *m1,
        if (m1->route_metric != m2->route_metric)
                return 0;
 
-       return m1->ip_address.s_addr == m2->ip_address.s_addr;
+       return !pim_addr_cmp(m1->ip_address, m2->ip_address);
 }
 
 int pim_assert_build_msg(uint8_t *pim_msg, int buf_size, struct interface *ifp,

diff --git a/pimd/pim_assert.h b/pimd/pim_assert.h
index 2e6e62cc3a5aec9d6a87315599560b206e62698c..a149fb176eda9c1775716592adccd1c9c2665ba6 100644 (file)
--- a/pimd/pim_assert.h
+++ b/pimd/pim_assert.h
@@ -37,7 +37,7 @@ 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
+       pim_addr ip_address; /* neighbor router that sourced the Assert
                                      message */
 };