proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-30 13:50:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Fix up > 80 columns

Browse Source 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-07-07 16:00:48 -04:00
parent 53bc94b070
commit ff5d90c2e9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pimd/pim_nht.c
View File

@ -513,6 +513,7 @@ int pim_ecmp_nexthop_search(struct pim_instance *pim,
nbrs[i] = pim_neighbor_find(ifps[i], nbrs[i] = pim_neighbor_find(ifps[i],
nh_node->gate.ipv4); nh_node->gate.ipv4);
if (nbrs[i] || pim_if_connected_to_source(ifps[i], if (nbrs[i] || pim_if_connected_to_source(ifps[i],
src->u.prefix4)) src->u.prefix4))
num_nbrs++; num_nbrs++;
} }

9
pimd/pim_rp.c
View File

@ -700,9 +700,9 @@ void pim_rp_setup(struct pim_instance *pim)
"%s: NHT Local Nexthop not found for RP %s ", "%s: NHT Local Nexthop not found for RP %s ",
__PRETTY_FUNCTION__, buf); __PRETTY_FUNCTION__, buf);
} }
if (!pim_ecmp_nexthop_lookup( if (!pim_ecmp_nexthop_lookup(pim,
pim, &rp_info->rp.source_nexthop, &rp_info->rp.source_nexthop,
&nht_p, &rp_info->group, 1)) &nht_p, &rp_info->group, 1))
if (PIM_DEBUG_PIM_NHT_RP) if (PIM_DEBUG_PIM_NHT_RP)
zlog_debug( zlog_debug(
"Unable to lookup nexthop for rp specified"); "Unable to lookup nexthop for rp specified");
@ -867,7 +867,8 @@ struct pim_rpf *pim_rp_g(struct pim_instance *pim, struct in_addr group)
__PRETTY_FUNCTION__, buf, buf1); __PRETTY_FUNCTION__, buf, buf1);
} }
pim_rpf_set_refresh_time(pim); pim_rpf_set_refresh_time(pim);
pim_ecmp_nexthop_lookup(pim, &rp_info->rp.source_nexthop, pim_ecmp_nexthop_lookup(pim,
&rp_info->rp.source_nexthop,
&nht_p, &rp_info->group, 1); &nht_p, &rp_info->group, 1);
} }
return (&rp_info->rp); return (&rp_info->rp);