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

Merge pull request #4066 from sworleys/Add-NG-Hash-Func

Browse Source 
lib: Add hash function for nexthop groups
This commit is contained in:
Mark Stapp 2019-04-05 21:31:41 +02:00 committed by GitHub
commit a1a972fff5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 63 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
lib/nexthop.c
View File

@ -314,14 +314,52 @@ unsigned int nexthop_level(struct nexthop *nexthop)
return rv; return rv;
} }
uint32_t nexthop_hash(struct nexthop *nexthop) uint32_t nexthop_hash(const struct nexthop *nexthop)
{ {
uint32_t key; uint32_t key = 0x45afe398;
key = jhash_1word(nexthop->vrf_id, 0x45afe398); key = jhash_3words(nexthop->type, nexthop->vrf_id,
nexthop->nh_label_type, key);
/* gate and blackhole are together in a union */
key = jhash(&nexthop->gate, sizeof(nexthop->gate), key);
key = jhash(&nexthop->src, sizeof(nexthop->src), key);
key = jhash(&nexthop->rmap_src, sizeof(nexthop->rmap_src), key);
if (nexthop->nh_label) {
int labels = nexthop->nh_label->num_labels;
int i = 0;
while (labels >= 3) {
key = jhash_3words(nexthop->nh_label->label[i],
nexthop->nh_label->label[i + 1],
nexthop->nh_label->label[i + 2],
key);
labels -= 3;
i += 3;
}
if (labels >= 2) {
key = jhash_2words(nexthop->nh_label->label[i],
nexthop->nh_label->label[i + 1],
key);
labels -= 2;
i += 2;
}
if (labels >= 1)
key = jhash_1word(nexthop->nh_label->label[i], key);
}
switch (nexthop->type) {
case NEXTHOP_TYPE_IPV4_IFINDEX:
case NEXTHOP_TYPE_IPV6_IFINDEX:
case NEXTHOP_TYPE_IFINDEX:
key = jhash_1word(nexthop->ifindex, key); key = jhash_1word(nexthop->ifindex, key);
key = jhash_1word(nexthop->type, key); break;
key = jhash(&nexthop->gate, sizeof(union g_addr), key); case NEXTHOP_TYPE_BLACKHOLE:
case NEXTHOP_TYPE_IPV4:
case NEXTHOP_TYPE_IPV6:
break;
}
return key; return key;
} }

2
lib/nexthop.h
View File

@ -136,7 +136,7 @@ void nexthop_del_labels(struct nexthop *);
* Returns: * Returns:
* 32-bit hash of nexthop * 32-bit hash of nexthop
*/ */
uint32_t nexthop_hash(struct nexthop *nexthop); uint32_t nexthop_hash(const struct nexthop *nexthop);
extern bool nexthop_same(const struct nexthop *nh1, const struct nexthop *nh2); extern bool nexthop_same(const struct nexthop *nh1, const struct nexthop *nh2);

16
lib/nexthop_group.c
View File

@ -25,6 +25,7 @@
#include <nexthop_group.h> #include <nexthop_group.h>
#include <vty.h> #include <vty.h>
#include <command.h> #include <command.h>
#include <jhash.h>
#ifndef VTYSH_EXTRACT_PL #ifndef VTYSH_EXTRACT_PL
#include "lib/nexthop_group_clippy.c" #include "lib/nexthop_group_clippy.c"
@ -147,6 +148,21 @@ void copy_nexthops(struct nexthop **tnh, const struct nexthop *nh,
} }
} }
uint32_t nexthop_group_hash(const struct nexthop_group *nhg)
{
struct nexthop *nh;
uint32_t key = 0;
/*
* We are not interested in hashing over any recursively
* resolved nexthops
*/
for (nh = nhg->nexthop; nh; nh = nh->next)
key = jhash_1word(nexthop_hash(nh), key);
return key;
}
static void nhgc_delete_nexthops(struct nexthop_group_cmd *nhgc) static void nhgc_delete_nexthops(struct nexthop_group_cmd *nhgc)
{ {
struct nexthop *nexthop; struct nexthop *nexthop;

2
lib/nexthop_group.h
View File

@ -47,6 +47,8 @@ void nexthop_del(struct nexthop_group *nhg, struct nexthop *nexthop);
void copy_nexthops(struct nexthop **tnh, const struct nexthop *nh, void copy_nexthops(struct nexthop **tnh, const struct nexthop *nh,
struct nexthop *rparent); struct nexthop *rparent);
uint32_t nexthop_group_hash(const struct nexthop_group *nhg);
/* The following for loop allows to iterate over the nexthop /* The following for loop allows to iterate over the nexthop
* structure of routes. * structure of routes.
* *