Merge pull request #4041 from donaldsharp/interface_deletion

bfdd, nhrpd, pimd: When deleting an interface clean up
This commit is contained in:
Rafael Zalamena 2019-03-29 15:12:45 -03:00 committed by GitHub
commit e5f988b544
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions

View File

@ -613,6 +613,8 @@ static int bfdd_interface_update(int cmd, struct zclient *zc,
bfdd_sessions_disable_interface(ifp);
if_set_index(ifp, IFINDEX_INTERNAL);
return 0;
}

View File

@ -327,9 +327,11 @@ int nhrp_interface_delete(int cmd, struct zclient *client, zebra_size_t length,
return 0;
debugf(NHRP_DEBUG_IF, "if-delete: %s", ifp->name);
if_set_index(ifp, ifp->ifindex);
nhrp_interface_update(ifp);
/* if_delete(ifp); */
if_set_index(ifp, IFINDEX_INTERNAL);
return 0;
}

View File

@ -150,6 +150,8 @@ static int pim_zebra_if_del(int command, struct zclient *zclient,
if (!if_is_operative(ifp))
pim_if_addr_del_all(ifp);
if_set_index(ifp, IFINDEX_INTERNAL);
return 0;
}