Merge pull request #3761 from patrasar/fix_refresh_oil_timer

pimd: Don't refersh the oif_creation timer if S,G already present
This commit is contained in:
Donald Sharp 2019-02-08 07:31:12 -05:00 committed by GitHub
commit e6ee7eb9e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -392,8 +392,10 @@ int pim_channel_add_oif(struct channel_oil *channel_oil, struct interface *oif,
if (channel_oil->oif_flags[pim_ifp->mroute_vif_index]
& PIM_OIF_FLAG_PROTO_ANY) {
channel_oil->oif_creation[pim_ifp->mroute_vif_index] =
pim_time_monotonic_sec();
/* Updating time here is not required as this time has to
* indicate when the interface is added
*/
channel_oil->oif_flags[pim_ifp->mroute_vif_index] |= proto_mask;
/* Check the OIF really exists before returning, and only log
warning otherwise */