proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 22:07:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Tweak pim_ifchannel_compare to be faster

Browse Source 
Tweak the ifchannel compare to sort based upon
interface first

Ticket: CM-15629
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-04-20 12:21:02 -04:00
parent b5e6281b65
commit e3a55f03bf
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pimd/pim_ifchannel.c
View File

@ -50,6 +50,15 @@ pim_ifchannel_compare (struct pim_ifchannel *ch1, struct pim_ifchannel *ch2)
struct pim_interface *pim_ifp1;
struct pim_interface *pim_ifp2;
pim_ifp1 = ch1->interface->info;
pim_ifp2 = ch2->interface->info;
if (pim_ifp1->mroute_vif_index < pim_ifp2->mroute_vif_index)
return -1;
if (pim_ifp1->mroute_vif_index > pim_ifp2->mroute_vif_index)
return 1;
if (ntohl(ch1->sg.grp.s_addr) < ntohl(ch2->sg.grp.s_addr))
return -1;
@ -62,20 +71,6 @@ pim_ifchannel_compare (struct pim_ifchannel *ch1, struct pim_ifchannel *ch2)
if (ntohl(ch1->sg.src.s_addr) > ntohl(ch2->sg.src.s_addr))
return 1;
pim_ifp1 = ch1->interface->info;
pim_ifp2 = ch2->interface->info;
if (ntohl(pim_ifp1->primary_address.s_addr) < ntohl(pim_ifp2->primary_address.s_addr))
return -1;
if (ntohl(pim_ifp1->primary_address.s_addr) > ntohl(pim_ifp2->primary_address.s_addr))
return 1;
if (pim_ifp1->mroute_vif_index < pim_ifp2->mroute_vif_index)
return -1;
if (pim_ifp1->mroute_vif_index > pim_ifp2->mroute_vif_index)
return 1;
return 0;
}