From c7130d3e5da379c7bf8da45e8e01b4f596d819e3 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 8 Jun 2022 16:51:48 -0400 Subject: [PATCH] pimd: Fix pim_channel_oil_empty tests The pim_channel_oil_empty() function was setting the pimreg if it ever existed for NULL comparison but of course the pimreg device is never pulled back out again when it was needed to be when the pimreg is not present. Commit: a5fa982256b23d53d5b833f75224fb7f96054b9b broke this. Fixes: #11368 Signed-off-by: Donald Sharp (cherry picked from commit 30b82c7af79fc167c39c1063c4e269c29e108fe4) --- pimd/pim_oil.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pimd/pim_oil.c b/pimd/pim_oil.c index 5b5cc2c103..9434ae07b7 100644 --- a/pimd/pim_oil.c +++ b/pimd/pim_oil.c @@ -544,27 +544,19 @@ int pim_channel_add_oif(struct channel_oil *channel_oil, struct interface *oif, int pim_channel_oil_empty(struct channel_oil *c_oil) { -#if PIM_IPV == 4 - static struct mfcctl null_oil; -#else - static struct mf6cctl null_oil; -#endif + static struct channel_oil null_oil; if (!c_oil) return 1; - /* exclude pimreg from the OIL when checking if the inherited_oil is * non-NULL. * pimreg device (in all vrfs) uses a vifi of * 0 (PIM_OIF_PIM_REGISTER_VIF) so we simply mfcc_ttls[0] */ - if (oil_if_has(c_oil, 0)) { -#if PIM_IPV == 4 - null_oil.mfcc_ttls[0] = 1; -#else - IF_SET(0, &null_oil.mf6cc_ifset); -#endif - } + if (oil_if_has(c_oil, 0)) + oil_if_set(&null_oil, 0, 1); + else + oil_if_set(&null_oil, 0, 0); - return !oil_if_cmp(&c_oil->oil, &null_oil); + return !oil_if_cmp(&c_oil->oil, &null_oil.oil); } -- 2.39.5