From ca7613e25a624d73c7febcb999851c4308c59140 Mon Sep 17 00:00:00 2001 From: sarita patra Date: Tue, 14 Dec 2021 04:25:40 -0800 Subject: [PATCH] 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 Signed-off-by: sarita patra --- pimd/pim_igmp.h | 4 ++-- pimd/pim_neighbor.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pimd/pim_igmp.h b/pimd/pim_igmp.h index a3f470d8dc..b82b62ea74 100644 --- 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 d71b2b87c3..12c469ae2a 100644 --- 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; -- 2.39.5