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

zebra: add ui control for use of backup nexthops in resolution

Browse Source 
Add a control and api for the use of backup nexthops in
recursive resolution. With 'no', we won't try to use installed
backup nexthops when resolving a recursive route.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2021-02-22 15:06:28 -05:00
parent 0a7edab036
commit aa45883818
3 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
zebra/zebra_nhg.c
View File

@ -52,9 +52,10 @@ DEFINE_MTYPE_STATIC(ZEBRA, NHG_CTX, "Nexthop Group Context");
/* id counter to keep in sync with kernel */ /* id counter to keep in sync with kernel */
uint32_t id_counter; uint32_t id_counter;
/* */ /* Controlled through ui */
static bool g_nexthops_enabled = true; static bool g_nexthops_enabled = true;
static bool proto_nexthops_only; static bool proto_nexthops_only;
static bool use_recursive_backups = true;
static struct nhg_hash_entry *depends_find(const struct nexthop *nh, afi_t afi, static struct nhg_hash_entry *depends_find(const struct nexthop *nh, afi_t afi,
int type, bool from_dplane); int type, bool from_dplane);
@ -2088,10 +2089,12 @@ static int nexthop_active(afi_t afi, struct nexthop *nexthop,
/* Examine installed backup nexthops, if any. There /* Examine installed backup nexthops, if any. There
* are only installed backups *if* there is a * are only installed backups *if* there is a
* dedicated fib list. * dedicated fib list. The UI can also control use
* of backups for resolution.
*/ */
nhg = rib_get_fib_backup_nhg(match); nhg = rib_get_fib_backup_nhg(match);
if (nhg == NULL || nhg->nexthop == NULL) if (!use_recursive_backups ||
nhg == NULL || nhg->nexthop == NULL)
goto done_with_match; goto done_with_match;
for (ALL_NEXTHOPS_PTR(nhg, newhop)) { for (ALL_NEXTHOPS_PTR(nhg, newhop)) {
@ -2834,6 +2837,17 @@ bool zebra_nhg_kernel_nexthops_enabled(void)
return g_nexthops_enabled; return g_nexthops_enabled;
} }
/* Global control for use of activated backups for recursive resolution. */
void zebra_nhg_set_recursive_use_backups(bool set)
{
use_recursive_backups = set;
}
bool zebra_nhg_recursive_use_backups(void)
{
return use_recursive_backups;
}
/* /*
* Global control to only use kernel nexthops for protocol created NHGs. * Global control to only use kernel nexthops for protocol created NHGs.
* There are some use cases where you may not want zebra to implicitly * There are some use cases where you may not want zebra to implicitly

4
zebra/zebra_nhg.h
View File

@ -212,6 +212,10 @@ bool zebra_nhg_kernel_nexthops_enabled(void);
void zebra_nhg_set_proto_nexthops_only(bool set); void zebra_nhg_set_proto_nexthops_only(bool set);
bool zebra_nhg_proto_nexthops_only(void); bool zebra_nhg_proto_nexthops_only(void);
/* Global control for use of activated backups for recursive resolution. */
void zebra_nhg_set_recursive_use_backups(bool set);
bool zebra_nhg_recursive_use_backups(void);
/** /**
* NHE abstracted tree functions. * NHE abstracted tree functions.
* Use these where possible instead of direct access. * Use these where possible instead of direct access.

16
zebra/zebra_vty.c
View File

@ -1636,6 +1636,18 @@ DEFPY_HIDDEN(proto_nexthop_group_only, proto_nexthop_group_only_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFPY_HIDDEN(backup_nexthop_recursive_use_enable,
backup_nexthop_recursive_use_enable_cmd,
"[no] zebra nexthop resolve-via-backup",
NO_STR
ZEBRA_STR
"Nexthop configuration \n"
"Configure use of backup nexthops in recursive resolution\n")
{
zebra_nhg_set_recursive_use_backups(!no);
return CMD_SUCCESS;
}
DEFUN (no_ip_nht_default_route, DEFUN (no_ip_nht_default_route,
no_ip_nht_default_route_cmd, no_ip_nht_default_route_cmd,
"no ip nht resolve-via-default", "no ip nht resolve-via-default",
@ -3619,6 +3631,9 @@ static int config_write_protocol(struct vty *vty)
if (zebra_nhg_proto_nexthops_only()) if (zebra_nhg_proto_nexthops_only())
vty_out(vty, "zebra nexthop proto only\n"); vty_out(vty, "zebra nexthop proto only\n");
if (!zebra_nhg_recursive_use_backups())
vty_out(vty, "no zebra nexthop resolve-via-backup\n");
#ifdef HAVE_NETLINK #ifdef HAVE_NETLINK
/* Include netlink info */ /* Include netlink info */
netlink_config_write_helper(vty); netlink_config_write_helper(vty);
@ -4054,6 +4069,7 @@ void zebra_vty_init(void)
install_element(CONFIG_NODE, &no_zebra_packet_process_cmd); install_element(CONFIG_NODE, &no_zebra_packet_process_cmd);
install_element(CONFIG_NODE, &nexthop_group_use_enable_cmd); install_element(CONFIG_NODE, &nexthop_group_use_enable_cmd);
install_element(CONFIG_NODE, &proto_nexthop_group_only_cmd); install_element(CONFIG_NODE, &proto_nexthop_group_only_cmd);
install_element(CONFIG_NODE, &backup_nexthop_recursive_use_enable_cmd);
install_element(VIEW_NODE, &show_nexthop_group_cmd); install_element(VIEW_NODE, &show_nexthop_group_cmd);
install_element(VIEW_NODE, &show_interface_nexthop_group_cmd); install_element(VIEW_NODE, &show_interface_nexthop_group_cmd);