proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-05 14:49:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: add backup-nexthop value to nexthop

Browse Source 
Add a field supporting a backup nexthop.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2020-01-16 16:24:16 -05:00
parent bf1626a6b1
commit defd2ea4a1
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/nexthop.c
View File

@ -23,11 +23,9 @@
#include "table.h" #include "table.h"
#include "memory.h" #include "memory.h"
#include "command.h" #include "command.h"
#include "if.h"
#include "log.h" #include "log.h"
#include "sockunion.h" #include "sockunion.h"
#include "linklist.h" #include "linklist.h"
#include "thread.h"
#include "prefix.h" #include "prefix.h"
#include "nexthop.h" #include "nexthop.h"
#include "mpls.h" #include "mpls.h"
@ -155,7 +153,24 @@ static int _nexthop_cmp_no_labels(const struct nexthop *next1,
} }
ret = _nexthop_source_cmp(next1, next2); ret = _nexthop_source_cmp(next1, next2);
if (ret != 0)
goto done;
if (!CHECK_FLAG(next1->flags, NEXTHOP_FLAG_HAS_BACKUP) &&
CHECK_FLAG(next2->flags, NEXTHOP_FLAG_HAS_BACKUP))
return -1;
if (CHECK_FLAG(next1->flags, NEXTHOP_FLAG_HAS_BACKUP) &&
!CHECK_FLAG(next2->flags, NEXTHOP_FLAG_HAS_BACKUP))
return 1;
if (next1->backup_idx < next2->backup_idx)
return -1;
if (next1->backup_idx > next2->backup_idx)
return 1;
done:
return ret; return ret;
} }
@ -240,7 +255,7 @@ struct nexthop *nexthop_new(void)
* The linux kernel does some weird stuff with adding +1 to * The linux kernel does some weird stuff with adding +1 to
* all nexthop weights it gets over netlink. * all nexthop weights it gets over netlink.
* To handle this, just default everything to 1 right from * To handle this, just default everything to 1 right from
* from the beggining so we don't have to special case * from the beginning so we don't have to special case
* default weights in the linux netlink code. * default weights in the linux netlink code.
* *
* 1 should be a valid on all platforms anyway. * 1 should be a valid on all platforms anyway.
@ -508,6 +523,7 @@ unsigned int nexthop_level(struct nexthop *nexthop)
uint32_t nexthop_hash_quick(const struct nexthop *nexthop) uint32_t nexthop_hash_quick(const struct nexthop *nexthop)
{ {
uint32_t key = 0x45afe398; uint32_t key = 0x45afe398;
uint32_t val;
key = jhash_3words(nexthop->type, nexthop->vrf_id, key = jhash_3words(nexthop->type, nexthop->vrf_id,
nexthop->nh_label_type, key); nexthop->nh_label_type, key);
@ -537,8 +553,12 @@ uint32_t nexthop_hash_quick(const struct nexthop *nexthop)
key = jhash_1word(nexthop->nh_label->label[i], key); key = jhash_1word(nexthop->nh_label->label[i], key);
} }
key = jhash_2words(nexthop->ifindex, val = 0;
CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ONLINK), if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_HAS_BACKUP))
val = (uint32_t)nexthop->backup_idx;
key = jhash_3words(nexthop->ifindex,
CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ONLINK), val,
key); key);
return key; return key;
@ -578,6 +598,7 @@ void nexthop_copy_no_recurse(struct nexthop *copy,
copy->type = nexthop->type; copy->type = nexthop->type;
copy->flags = nexthop->flags; copy->flags = nexthop->flags;
copy->weight = nexthop->weight; copy->weight = nexthop->weight;
copy->backup_idx = nexthop->backup_idx;
memcpy(&copy->gate, &nexthop->gate, sizeof(nexthop->gate)); memcpy(&copy->gate, &nexthop->gate, sizeof(nexthop->gate));
memcpy(&copy->src, &nexthop->src, sizeof(nexthop->src)); memcpy(&copy->src, &nexthop->src, sizeof(nexthop->src));
memcpy(&copy->rmap_src, &nexthop->rmap_src, sizeof(nexthop->rmap_src)); memcpy(&copy->rmap_src, &nexthop->rmap_src, sizeof(nexthop->rmap_src));

9
lib/nexthop.h
View File

@ -86,6 +86,8 @@ struct nexthop {
* active one * active one
*/ */
#define NEXTHOP_FLAG_RNH_FILTERED (1 << 5) /* rmap filtered, used by rnh */ #define NEXTHOP_FLAG_RNH_FILTERED (1 << 5) /* rmap filtered, used by rnh */
#define NEXTHOP_FLAG_HAS_BACKUP (1 << 6) /* Backup nexthop index is set */
#define NEXTHOP_IS_ACTIVE(flags) \ #define NEXTHOP_IS_ACTIVE(flags) \
(CHECK_FLAG(flags, NEXTHOP_FLAG_ACTIVE) \ (CHECK_FLAG(flags, NEXTHOP_FLAG_ACTIVE) \
&& !CHECK_FLAG(flags, NEXTHOP_FLAG_DUPLICATE)) && !CHECK_FLAG(flags, NEXTHOP_FLAG_DUPLICATE))
@ -116,8 +118,15 @@ struct nexthop {
/* Weight of the nexthop ( for unequal cost ECMP ) */ /* Weight of the nexthop ( for unequal cost ECMP ) */
uint8_t weight; uint8_t weight;
/* Index of a corresponding backup nexthop in a backup list;
* only meaningful if the HAS_BACKUP flag is set.
*/
uint8_t backup_idx;
}; };
/* Backup index value is limited */
#define NEXTHOP_BACKUP_IDX_MAX 255
/* Utility to append one nexthop to another. */ /* Utility to append one nexthop to another. */
#define NEXTHOP_APPEND(to, new) \ #define NEXTHOP_APPEND(to, new) \