proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-14 13:22:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4327 from sworleys/Move-Multipath-Num

Browse Source 
zebra: Move multipath_num into zrouter
This commit is contained in:
Russ White 2019-05-16 10:04:14 -04:00 committed by GitHub
commit cc25952f2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zebra/main.c
View File

@ -119,8 +119,6 @@ struct zebra_privs_t zserv_privs = {
.cap_num_p = array_size(_caps_p), .cap_num_p = array_size(_caps_p),
.cap_num_i = 0}; .cap_num_i = 0};
unsigned int multipath_num = MULTIPATH_NUM;
/* SIGHUP handler. */ /* SIGHUP handler. */
static void sighup(void) static void sighup(void)
{ {
@ -322,9 +320,9 @@ int main(int argc, char **argv)
keep_kernel_mode = 1; keep_kernel_mode = 1;
break; break;
case 'e': case 'e':
multipath_num = atoi(optarg); zrouter.multipath_num = atoi(optarg);
if (multipath_num > MULTIPATH_NUM if (zrouter.multipath_num > MULTIPATH_NUM
|| multipath_num <= 0) { || zrouter.multipath_num <= 0) {
flog_err( flog_err(
EC_ZEBRA_BAD_MULTIPATH_NUM, EC_ZEBRA_BAD_MULTIPATH_NUM,
"Multipath Number specified must be less than %d and greater than 0", "Multipath Number specified must be less than %d and greater than 0",

6
zebra/zapi_msg.c
View File

@ -1339,14 +1339,14 @@ static void zread_interface_delete(ZAPI_HANDLER_ARGS)
void zserv_nexthop_num_warn(const char *caller, const struct prefix *p, void zserv_nexthop_num_warn(const char *caller, const struct prefix *p,
const unsigned int nexthop_num) const unsigned int nexthop_num)
{ {
if (nexthop_num > multipath_num) { if (nexthop_num > zrouter.multipath_num) {
char buff[PREFIX2STR_BUFFER]; char buff[PREFIX2STR_BUFFER];
prefix2str(p, buff, sizeof(buff)); prefix2str(p, buff, sizeof(buff));
flog_warn( flog_warn(
EC_ZEBRA_MORE_NH_THAN_MULTIPATH, EC_ZEBRA_MORE_NH_THAN_MULTIPATH,
"%s: Prefix %s has %d nexthops, but we can only use the first %d", "%s: Prefix %s has %d nexthops, but we can only use the first %d",
caller, buff, nexthop_num, multipath_num); caller, buff, nexthop_num, zrouter.multipath_num);
} }
} }
@ -1651,7 +1651,7 @@ static void zsend_capabilities(struct zserv *client, struct zebra_vrf *zvrf)
zclient_create_header(s, ZEBRA_CAPABILITIES, zvrf->vrf->vrf_id); zclient_create_header(s, ZEBRA_CAPABILITIES, zvrf->vrf->vrf_id);
stream_putl(s, vrf_get_backend()); stream_putl(s, vrf_get_backend());
stream_putc(s, mpls_enabled); stream_putc(s, mpls_enabled);
stream_putl(s, multipath_num); stream_putl(s, zrouter.multipath_num);
stream_putc(s, zebra_mlag_get_role()); stream_putc(s, zebra_mlag_get_role());
stream_putw_at(s, 0, stream_get_endp(s)); stream_putw_at(s, 0, stream_get_endp(s));

3
zebra/zebra_fpm_netlink.c
View File

@ -32,6 +32,7 @@
#include "prefix.h" #include "prefix.h"
#include "zebra/zserv.h" #include "zebra/zserv.h"
#include "zebra/zebra_router.h"
#include "zebra/zebra_dplane.h" #include "zebra/zebra_dplane.h"
#include "zebra/zebra_ns.h" #include "zebra/zebra_ns.h"
#include "zebra/zebra_vrf.h" #include "zebra/zebra_vrf.h"
@ -251,7 +252,7 @@ static int netlink_route_info_fill(netlink_route_info_t *ri, int cmd,
ri->metric = &re->metric; ri->metric = &re->metric;
for (ALL_NEXTHOPS(re->ng, nexthop)) { for (ALL_NEXTHOPS(re->ng, nexthop)) {
if (ri->num_nhs >= multipath_num) if (ri->num_nhs >= zrouter.multipath_num)
break; break;
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE)) if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE))

3
zebra/zebra_mpls_openbsd.c
View File

@ -27,6 +27,7 @@
#include "zebra/zebra_mpls.h" #include "zebra/zebra_mpls.h"
#include "zebra/debug.h" #include "zebra/debug.h"
#include "zebra/zebra_errors.h" #include "zebra/zebra_errors.h"
#include "zebra/zebra_router.h"
#include "privs.h" #include "privs.h"
#include "prefix.h" #include "prefix.h"
@ -262,7 +263,7 @@ static int kernel_lsp_cmd(struct zebra_dplane_ctx *ctx)
if (!nexthop) if (!nexthop)
continue; continue;
if (nexthop_num >= multipath_num) if (nexthop_num >= zrouter.multipath_num)
break; break;
if (((action == RTM_ADD || action == RTM_CHANGE) if (((action == RTM_ADD || action == RTM_CHANGE)

3
zebra/zebra_rib.c
View File

@ -955,7 +955,8 @@ static int nexthop_active_update(struct route_node *rn, struct route_entry *re)
* decision point. * decision point.
*/ */
new_active = nexthop_active_check(rn, re, nexthop); new_active = nexthop_active_check(rn, re, nexthop);
if (new_active && re->nexthop_active_num >= multipath_num) { if (new_active
&& re->nexthop_active_num >= zrouter.multipath_num) {
UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE); UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE);
new_active = 0; new_active = 0;
} }

4
zebra/zebra_router.c
View File

@ -30,7 +30,9 @@
#include "zebra_vxlan.h" #include "zebra_vxlan.h"
#include "zebra_mlag.h" #include "zebra_mlag.h"
struct zebra_router zrouter; struct zebra_router zrouter = {
.multipath_num = MULTIPATH_NUM,
};
static inline int static inline int
zebra_router_table_entry_compare(const struct zebra_router_table *e1, zebra_router_table_entry_compare(const struct zebra_router_table *e1,

2
zebra/zebra_router.h
View File

@ -109,6 +109,8 @@ struct zebra_router {
* The EVPN instance, if any * The EVPN instance, if any
*/ */
struct zebra_vrf *evpn_vrf; struct zebra_vrf *evpn_vrf;
uint32_t multipath_num;
}; };
extern struct zebra_router zrouter; extern struct zebra_router zrouter;

2
zebra/zserv.h
View File

@ -173,8 +173,6 @@ struct zserv {
DECLARE_HOOK(zserv_client_connect, (struct zserv *client), (client)); DECLARE_HOOK(zserv_client_connect, (struct zserv *client), (client));
DECLARE_KOOH(zserv_client_close, (struct zserv *client), (client)); DECLARE_KOOH(zserv_client_close, (struct zserv *client), (client));
extern unsigned int multipath_num;
/* /*
* Initialize Zebra API server. * Initialize Zebra API server.
* *