matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

pimd: Modifying name of struct igmp_join to struct gm_join to accomodate IPv6 changes.

Browse source 
Fix:
====
Modifying name of struct igmp_join to struct gm_join, which is to be used
by both IPv4 and IPv6(for both MLD and IGMP).

Co-authored-by: Abhishek N R abnr@vmware.com
Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
This commit is contained in:
Mobashshera Rasool 2021-12-03 09:25:20 -08:00
parent b468f3f7fb
commit 7caa9451af
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pimd/pim_cmd.c
View file

@ -822,7 +822,7 @@ static void igmp_show_interface_join(struct pim_instance *pim, struct vty *vty,
FOR_ALL_INTERFACES (pim->vrf, ifp) { FOR_ALL_INTERFACES (pim->vrf, ifp) {
struct pim_interface *pim_ifp; struct pim_interface *pim_ifp;
struct listnode *join_node; struct listnode *join_node;
struct igmp_join *ij; struct gm_join *ij;
struct in_addr pri_addr; struct in_addr pri_addr;
char pri_addr_str[INET_ADDRSTRLEN]; char pri_addr_str[INET_ADDRSTRLEN];

18
pimd/pim_iface.c
View file

@ -550,7 +550,7 @@ void pim_if_addr_add(struct connected *ifc)
if (pim_ifp->join_list) { if (pim_ifp->join_list) {
struct listnode *node; struct listnode *node;
struct listnode *nextnode; struct listnode *nextnode;
struct igmp_join *ij; struct gm_join *ij;
int join_fd; int join_fd;
for (ALL_LIST_ELEMENTS(pim_ifp->join_list, node, for (ALL_LIST_ELEMENTS(pim_ifp->join_list, node,
@ -1157,17 +1157,17 @@ long pim_if_t_suppressed_msec(struct interface *ifp)
return t_suppressed_msec; return t_suppressed_msec;
} }
static void igmp_join_free(struct igmp_join *ij) static void igmp_join_free(struct gm_join *ij)
{ {
XFREE(MTYPE_PIM_IGMP_JOIN, ij); XFREE(MTYPE_PIM_IGMP_JOIN, ij);
} }
static struct igmp_join *igmp_join_find(struct list *join_list, static struct gm_join *igmp_join_find(struct list *join_list,
struct in_addr group_addr, struct in_addr group_addr,
struct in_addr source_addr) struct in_addr source_addr)
{ {
struct listnode *node; struct listnode *node;
struct igmp_join *ij; struct gm_join *ij;
assert(join_list); assert(join_list);
@ -1209,12 +1209,12 @@ static int igmp_join_sock(const char *ifname, ifindex_t ifindex,
return join_fd; return join_fd;
} }
static struct igmp_join *igmp_join_new(struct interface *ifp, static struct gm_join *igmp_join_new(struct interface *ifp,
struct in_addr group_addr, struct in_addr group_addr,
struct in_addr source_addr) struct in_addr source_addr)
{ {
struct pim_interface *pim_ifp; struct pim_interface *pim_ifp;
struct igmp_join *ij; struct gm_join *ij;
int join_fd; int join_fd;
pim_ifp = ifp->info; pim_ifp = ifp->info;
@ -1252,7 +1252,7 @@ ferr_r pim_if_igmp_join_add(struct interface *ifp, struct in_addr group_addr,
struct in_addr source_addr) struct in_addr source_addr)
{ {
struct pim_interface *pim_ifp; struct pim_interface *pim_ifp;
struct igmp_join *ij; struct gm_join *ij;
pim_ifp = ifp->info; pim_ifp = ifp->info;
if (!pim_ifp) { if (!pim_ifp) {
@ -1295,7 +1295,7 @@ int pim_if_igmp_join_del(struct interface *ifp, struct in_addr group_addr,
struct in_addr source_addr) struct in_addr source_addr)
{ {
struct pim_interface *pim_ifp; struct pim_interface *pim_ifp;
struct igmp_join *ij; struct gm_join *ij;
pim_ifp = ifp->info; pim_ifp = ifp->info;
if (!pim_ifp) { if (!pim_ifp) {
@ -1352,7 +1352,7 @@ static void pim_if_igmp_join_del_all(struct interface *ifp)
struct pim_interface *pim_ifp; struct pim_interface *pim_ifp;
struct listnode *node; struct listnode *node;
struct listnode *nextnode; struct listnode *nextnode;
struct igmp_join *ij; struct gm_join *ij;
pim_ifp = ifp->info; pim_ifp = ifp->info;
if (!pim_ifp) { if (!pim_ifp) {

2
pimd/pim_igmp.h
View file

@ -75,7 +75,7 @@
output |= *((ptr) + 1); \ output |= *((ptr) + 1); \
} while (0) } while (0)
struct igmp_join { struct gm_join {
struct in_addr group_addr; struct in_addr group_addr;
struct in_addr source_addr; struct in_addr source_addr;
int sock_fd; int sock_fd;

2
pimd/pim_vty.c
View file

@ -403,7 +403,7 @@ int pim_interface_config_write(struct vty *vty)
/* IF ip igmp join */ /* IF ip igmp join */
if (pim_ifp->join_list) { if (pim_ifp->join_list) {
struct listnode *node; struct listnode *node;
struct igmp_join *ij; struct gm_join *ij;
for (ALL_LIST_ELEMENTS_RO( for (ALL_LIST_ELEMENTS_RO(
pim_ifp->join_list, node, pim_ifp->join_list, node,
ij)) { ij)) {