Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pimd: Data structure changes to accommodate address family for IPv4 and IPv6 #10212

Merged
merged 13 commits into from
Jan 11, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
pimd: Modifying in_addr to pim_addr in struct pim_iface_upstream_switch
Changed struct in_addr address to struct pim_addr in struct
pim_iface_upstream_switch 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>
  • Loading branch information
patrasar authored and mobash-rasool committed Jan 11, 2022
commit 568b78b5bd7ba40bfb08a7c231a4b15ca445ea05
3 changes: 2 additions & 1 deletion pimd/pim_iface.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include "pim_upstream.h"
#include "pim_instance.h"
#include "bfd.h"
#include "pim_str.h"

#define PIM_IF_MASK_PIM (1 << 0)
#define PIM_IF_MASK_IGMP (1 << 1)
Expand Down Expand Up @@ -76,7 +77,7 @@
#define PIM_IF_FLAG_UNSET_HELLO_SENT(flags) ((flags) &= ~PIM_IF_FLAG_HELLO_SENT)

struct pim_iface_upstream_switch {
struct in_addr address;
pim_addr address;
struct list *us;
};

Expand Down
2 changes: 1 addition & 1 deletion pimd/pim_igmp.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ struct gm_sock {
struct thread
*t_igmp_query_timer; /* timer: issue IGMP general queries */
struct thread *t_other_querier_timer; /* timer: other querier present */
struct in_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;
Expand Down