mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-07-27 08:32:12 +00:00
Merge pull request #678 from chiragshah6/pim_dev
pimd: fix pim bfd crash and bfd down check specific neigh addr
This commit is contained in:
commit
9d693a54fa
@ -44,6 +44,9 @@ pim_bfd_write_config (struct vty *vty, struct interface *ifp)
|
|||||||
struct pim_interface *pim_ifp = ifp->info;
|
struct pim_interface *pim_ifp = ifp->info;
|
||||||
struct bfd_info *bfd_info = NULL;
|
struct bfd_info *bfd_info = NULL;
|
||||||
|
|
||||||
|
if (!pim_ifp)
|
||||||
|
return;
|
||||||
|
|
||||||
bfd_info = (struct bfd_info *) pim_ifp->bfd_info;
|
bfd_info = (struct bfd_info *) pim_ifp->bfd_info;
|
||||||
if (!bfd_info)
|
if (!bfd_info)
|
||||||
return;
|
return;
|
||||||
@ -194,6 +197,8 @@ pim_bfd_if_param_set (struct interface *ifp, u_int32_t min_rx,
|
|||||||
struct pim_interface *pim_ifp = ifp->info;
|
struct pim_interface *pim_ifp = ifp->info;
|
||||||
int command = 0;
|
int command = 0;
|
||||||
|
|
||||||
|
if (!pim_ifp)
|
||||||
|
return;
|
||||||
bfd_set_param ((struct bfd_info **) &(pim_ifp->bfd_info), min_rx, min_tx,
|
bfd_set_param ((struct bfd_info **) &(pim_ifp->bfd_info), min_rx, min_tx,
|
||||||
detect_mult, defaults, &command);
|
detect_mult, defaults, &command);
|
||||||
|
|
||||||
@ -259,6 +264,10 @@ pim_bfd_interface_dest_update (int command, struct zclient *zclient,
|
|||||||
for (ALL_LIST_ELEMENTS (pim_ifp->pim_neighbor_list, neigh_node,
|
for (ALL_LIST_ELEMENTS (pim_ifp->pim_neighbor_list, neigh_node,
|
||||||
neigh_nextnode, neigh))
|
neigh_nextnode, neigh))
|
||||||
{
|
{
|
||||||
|
/* Check neigh address matches with BFD address */
|
||||||
|
if (neigh->source_addr.s_addr != p.u.prefix4.s_addr)
|
||||||
|
continue;
|
||||||
|
|
||||||
bfd_info = (struct bfd_info *) neigh->bfd_info;
|
bfd_info = (struct bfd_info *) neigh->bfd_info;
|
||||||
if (bfd_info->status == status)
|
if (bfd_info->status == status)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user