proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 22:26:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: remove pim_interface->options

Browse Source 
I should've removed this in #10960.  It's a hazard in terms of
forgetting to adjust PRs/other changes that might accidentally still
reference the field.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2022-04-08 10:30:24 +02:00
parent e09284ca09
commit 4f977c8e77
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pimd/pim_iface.c
View File

@ -123,7 +123,6 @@ struct pim_interface *pim_if_new(struct interface *ifp, bool igmp, bool pim,
pim_ifp = XCALLOC(MTYPE_PIM_INTERFACE, sizeof(*pim_ifp));
pim_ifp->options = 0;
pim_ifp->pim = ifp->vrf->info;
pim_ifp->mroute_vif_index = -1;

1
pimd/pim_iface.h
View File

@ -75,7 +75,6 @@ struct pim_interface {
bool igmp_enable : 1;
uint32_t options; /* bit vector */
ifindex_t mroute_vif_index;
struct pim_instance *pim;

8
pimd/pim_igmp.c
View File

@ -242,8 +242,7 @@ void igmp_source_forward_stop(struct gm_source *source)
/* This socket is used for TXing IGMP packets only, IGMP RX happens
* in pim_mroute_msg()
*/
static int igmp_sock_open(struct in_addr ifaddr, struct interface *ifp,
uint32_t pim_options)
static int igmp_sock_open(struct in_addr ifaddr, struct interface *ifp)
{
int fd;
int join = 0;
@ -1254,14 +1253,11 @@ struct gm_sock *pim_igmp_sock_add(struct list *igmp_sock_list,
struct in_addr ifaddr, struct interface *ifp,
bool mtrace_only)
{
struct pim_interface *pim_ifp;
struct gm_sock *igmp;
struct sockaddr_in sin;
int fd;
pim_ifp = ifp->info;
fd = igmp_sock_open(ifaddr, ifp, pim_ifp->options);
fd = igmp_sock_open(ifaddr, ifp);
if (fd < 0) {
zlog_warn("Could not open IGMP socket for %pI4 on %s",
&ifaddr, ifp->name);