diff options
| -rw-r--r-- | pimd/pim_cmd.c | 6 | ||||
| -rw-r--r-- | pimd/pim_iface.c | 4 | ||||
| -rw-r--r-- | pimd/pim_iface.h | 2 | ||||
| -rw-r--r-- | pimd/pim_zebra.c | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index dd2ba9373..1f3336811 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -5766,8 +5766,7 @@ static int pim_cmd_igmp_start(struct vty *vty, struct interface *ifp) pim_ifp = ifp->info; if (!pim_ifp) { - pim_ifp = pim_if_new(ifp, 1 /* igmp=true */, 0 /* pim=false */, - false); + pim_ifp = pim_if_new(ifp, true, false, false); if (!pim_ifp) { vty_out(vty, "Could not enable IGMP on interface %s\n", ifp->name); @@ -6378,8 +6377,7 @@ static int pim_cmd_interface_add(struct interface *ifp) struct pim_interface *pim_ifp = ifp->info; if (!pim_ifp) { - pim_ifp = pim_if_new(ifp, 0 /* igmp=false */, 1 /* pim=true */, - false); + pim_ifp = pim_if_new(ifp, false, true, false); if (!pim_ifp) { return 0; } diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c index 66773efb3..249b24c0d 100644 --- a/pimd/pim_iface.c +++ b/pimd/pim_iface.c @@ -108,7 +108,7 @@ static int pim_sec_addr_comp(const void *p1, const void *p2) return 0; } -struct pim_interface *pim_if_new(struct interface *ifp, int igmp, int pim, +struct pim_interface *pim_if_new(struct interface *ifp, bool igmp, bool pim, bool ispimreg) { struct pim_interface *pim_ifp; @@ -1468,7 +1468,7 @@ void pim_if_create_pimreg(struct pim_instance *pim) pim->regiface = if_create(pimreg_name, pim->vrf_id); pim->regiface->ifindex = PIM_OIF_PIM_REGISTER_VIF; - pim_if_new(pim->regiface, 0, 0, true); + pim_if_new(pim->regiface, false, false, true); } } diff --git a/pimd/pim_iface.h b/pimd/pim_iface.h index 189153449..a7dc097f8 100644 --- a/pimd/pim_iface.h +++ b/pimd/pim_iface.h @@ -154,7 +154,7 @@ struct pim_interface { void pim_if_init(struct pim_instance *pim); void pim_if_terminate(struct pim_instance *pim); -struct pim_interface *pim_if_new(struct interface *ifp, int igmp, int pim, +struct pim_interface *pim_if_new(struct interface *ifp, bool igmp, bool pim, bool ispimreg); void pim_if_delete(struct interface *ifp); void pim_if_addr_add(struct connected *ifc); diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c index ad60e8e3a..4fa4ea857 100644 --- a/pimd/pim_zebra.c +++ b/pimd/pim_zebra.c @@ -112,7 +112,7 @@ static int pim_zebra_if_add(int command, struct zclient *zclient, struct pim_interface *pim_ifp; if (!ifp->info) { - pim_ifp = pim_if_new(ifp, 0, 0, false); + pim_ifp = pim_if_new(ifp, false, false, false); ifp->info = pim_ifp; } |