From e34a317acf2addc6d864d238ed41f5977403af43 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 26 Jan 2017 19:14:06 -0500 Subject: [PATCH] pimd: Modify pimreg creation We were creating the pimreg device with a created ifindex of 255. This was causing issues when a interface was assigned a ifindex of 255 by the kernel. Subsuquently pim would stay in a hosed up state. Modify the ifindex used for the pimreg device to be 0. Ticket: CM-14625 Signed-off-by: Donald Sharp --- pimd/pim_iface.c | 2 +- pimd/pim_oil.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c index e1cc3a97cf..7f64c9d5f2 100644 --- a/pimd/pim_iface.c +++ b/pimd/pim_iface.c @@ -893,7 +893,7 @@ int pim_if_add_vif(struct interface *ifp) return -1; } - if (ifp->ifindex < 1) { + if (ifp->ifindex < 0) { zlog_warn("%s: ifindex=%d < 1 on interface %s", __PRETTY_FUNCTION__, ifp->ifindex, ifp->name); diff --git a/pimd/pim_oil.h b/pimd/pim_oil.h index 6b96750ad1..e90cd5fc19 100644 --- a/pimd/pim_oil.h +++ b/pimd/pim_oil.h @@ -48,8 +48,8 @@ * Don't come running to me if this assumption is bad, * fix it. */ -#define PIM_OIF_PIM_REGISTER_VIF (MAXVIFS - 1) -#define PIM_MAX_USABLE_VIFS (MAXVIFS - 2) +#define PIM_OIF_PIM_REGISTER_VIF 0 +#define PIM_MAX_USABLE_VIFS (MAXVIFS - 1) struct channel_counts -- 2.39.5