pimd: Modifying in_addr to pim_addr in struct pim_neighbor and gm_sock

Changed struct in_addr source_addr to struct PIM_ADDR source_addr
which is to be used in both IPv4 and IPv6(Both MLD and IGMP).
Reviewed-by: Mobashshera Rasool <mrasool@vmware.com>
Signed-off-by: sarita patra <saritap@vmware.com>

diff --git a/pimd/pim_igmp.h b/pimd/pim_igmp.h
index a3f470d8dc713d45b1551eefcac3ce6ebb33b9ca..b82b62ea74cff6d20ddc317f03561d644ddc9f70 100644 (file)
--- a/pimd/pim_igmp.h
+++ b/pimd/pim_igmp.h
@@ -86,14 +86,14 @@ struct gm_join {
 struct gm_sock {
        int fd;
        struct interface *interface;
-       struct in_addr ifaddr;
+       pim_addr ifaddr;
        time_t sock_creation;
 
        struct thread *t_igmp_read; /* read: IGMP sockets */
        struct thread
                *t_igmp_query_timer; /* timer: issue IGMP general queries */
        struct thread *t_other_querier_timer; /* timer: other querier present */
-       pim_addr querier_addr;   /* IP address of the querier */
+       pim_addr querier_addr;                /* IP address of the querier */
        int querier_query_interval;        /* QQI */
        int querier_robustness_variable; /* QRV */
        int startup_query_count;

diff --git a/pimd/pim_neighbor.h b/pimd/pim_neighbor.h
index d71b2b87c30880a6661724317073ea725e11ec95..12c469ae2a335edb6c105bbc5dfbd25146bd0655 100644 (file)
--- a/pimd/pim_neighbor.h
+++ b/pimd/pim_neighbor.h
@@ -28,10 +28,11 @@
 
 #include "pim_tlv.h"
 #include "pim_iface.h"
+#include "pim_str.h"
 
 struct pim_neighbor {
        int64_t creation; /* timestamp of creation */
-       struct in_addr source_addr;
+       pim_addr source_addr;
        pim_hello_options hello_options;
        uint16_t holdtime;
        uint16_t propagation_delay_msec;