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

fabricd: allow redistribute statements with both the route-map and metric options

Browse Source 
Signed-off-by: Dmitrii Turlupov <dturlupov@factor-ts.ru>
This commit is contained in:
Dmitrii Turlupov 2019-04-01 16:55:38 +03:00 committed by Renato Westphal
parent 82c25998be
commit ee22b19613
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
isisd/isis_redist.c
View File

@ -516,7 +516,7 @@ void isis_redist_area_finish(struct isis_area *area)
DEFUN (isis_redistribute,
isis_redistribute_cmd,
"redistribute <ipv4|ipv6> " PROTO_REDIST_STR
" [<metric (0-16777215)|route-map WORD>]",
" [{metric (0-16777215)|route-map WORD}]",
REDIST_STR
"Redistribute IPv4 routes\n"
"Redistribute IPv6 routes\n"
@ -528,7 +528,7 @@ DEFUN (isis_redistribute,
{
int idx_afi = 1;
int idx_protocol = 2;
int idx_metric_rmap = fabricd ? 3 : 4;
int idx_metric_rmap = 1;
VTY_DECLVAR_CONTEXT(isis_area, area);
int family;
int afi;
@ -556,20 +556,13 @@ DEFUN (isis_redistribute,
return CMD_WARNING_CONFIG_FAILED;
}
if (argc > idx_metric_rmap + 1) {
if (argv[idx_metric_rmap + 1]->arg[0] == '\0')
return CMD_WARNING_CONFIG_FAILED;
if (argv_find(argv, argc, "metric", &idx_metric_rmap)) {
metric = strtoul(argv[idx_metric_rmap + 1]->arg, NULL, 10);
}
if (strmatch(argv[idx_metric_rmap]->text, "metric")) {
char *endp;
metric = strtoul(argv[idx_metric_rmap + 1]->arg, &endp,
10);
if (*endp != '\0')
return CMD_WARNING_CONFIG_FAILED;
} else {
routemap = argv[idx_metric_rmap + 1]->arg;
}
idx_metric_rmap = 1;
if (argv_find(argv, argc, "route-map", &idx_metric_rmap)) {
routemap = argv[idx_metric_rmap + 1]->arg;
}
isis_redist_set(area, level, family, type, metric, routemap, 0);
@ -614,7 +607,7 @@ DEFUN (no_isis_redistribute,
DEFUN (isis_default_originate,
isis_default_originate_cmd,
"default-information originate <ipv4|ipv6>"
" [always] [<metric (0-16777215)|route-map WORD>]",
" [always] [{metric (0-16777215)|route-map WORD}]",
"Control distribution of default information\n"
"Distribute a default route\n"
"Distribute default route for IPv4\n"
@ -627,7 +620,7 @@ DEFUN (isis_default_originate,
{
int idx_afi = 2;
int idx_always = fabricd ? 3 : 4;
int idx_metric_rmap = fabricd ? 3 : 4;
int idx_metric_rmap = 1;
VTY_DECLVAR_CONTEXT(isis_area, area);
int family;
int originate_type = DEFAULT_ORIGINATE;
@ -651,12 +644,13 @@ DEFUN (isis_default_originate,
idx_metric_rmap++;
}
if (argc > idx_metric_rmap) {
if (strmatch(argv[idx_metric_rmap]->text, "metric"))
metric = strtoul(argv[idx_metric_rmap + 1]->arg, NULL,
10);
else
routemap = argv[idx_metric_rmap + 1]->arg;
if (argv_find(argv, argc, "metric", &idx_metric_rmap)) {
metric = strtoul(argv[idx_metric_rmap + 1]->arg, NULL, 10);
}
idx_metric_rmap = 1;
if (argv_find(argv, argc, "route-map", &idx_metric_rmap)) {
routemap = argv[idx_metric_rmap + 1]->arg;
}
if (family == AF_INET6 && originate_type != DEFAULT_ORIGINATE_ALWAYS) {