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

Merge pull request #2185 from opensourcerouting/isis-redist-metric-fix

Browse Source 
isisd: use 0 as default-metric for redistribution
This commit is contained in:
Donald Sharp 2018-05-08 14:10:02 -04:00 committed by GitHub
commit ff7a93c67b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
isisd/isis_redist.c
View File

@ -184,8 +184,7 @@ static void isis_redist_update_ext_reach(struct isis_area *area, int level,
route_map_result_t map_ret; route_map_result_t map_ret;
memcpy(&area_info, info, sizeof(area_info)); memcpy(&area_info, info, sizeof(area_info));
if (redist->metric != 0xffffffff) area_info.metric = redist->metric;
area_info.metric = redist->metric;
if (redist->map_name) { if (redist->map_name) {
map_ret = map_ret =
@ -540,7 +539,7 @@ DEFUN (isis_redistribute,
int afi; int afi;
int type; int type;
int level; int level;
unsigned long metric; unsigned long metric = 0;
const char *routemap = NULL; const char *routemap = NULL;
family = str2family(argv[idx_afi]->text); family = str2family(argv[idx_afi]->text);
@ -567,9 +566,6 @@ DEFUN (isis_redistribute,
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
metric = 0xffffffff;
routemap = NULL;
if (argc > idx_metric_rmap + 1) { if (argc > idx_metric_rmap + 1) {
if (argv[idx_metric_rmap + 1]->arg[0] == '\0') if (argv[idx_metric_rmap + 1]->arg[0] == '\0')
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
@ -651,7 +647,7 @@ DEFUN (isis_default_originate,
int family; int family;
int originate_type = DEFAULT_ORIGINATE; int originate_type = DEFAULT_ORIGINATE;
int level; int level;
unsigned long metric = 0xffffffff; unsigned long metric = 0;
const char *routemap = NULL; const char *routemap = NULL;
family = str2family(argv[idx_afi]->text); family = str2family(argv[idx_afi]->text);
@ -748,7 +744,7 @@ int isis_redist_config_write(struct vty *vty, struct isis_area *area,
continue; continue;
vty_out(vty, " redistribute %s %s level-%d", family_str, vty_out(vty, " redistribute %s %s level-%d", family_str,
zebra_route_string(type), level); zebra_route_string(type), level);
if (redist->metric != 0xffffffff) if (redist->metric)
vty_out(vty, " metric %u", redist->metric); vty_out(vty, " metric %u", redist->metric);
if (redist->map_name) if (redist->map_name)
vty_out(vty, " route-map %s", redist->map_name); vty_out(vty, " route-map %s", redist->map_name);
@ -766,7 +762,7 @@ int isis_redist_config_write(struct vty *vty, struct isis_area *area,
family_str, level); family_str, level);
if (redist->redist == DEFAULT_ORIGINATE_ALWAYS) if (redist->redist == DEFAULT_ORIGINATE_ALWAYS)
vty_out(vty, " always"); vty_out(vty, " always");
if (redist->metric != 0xffffffff) if (redist->metric)
vty_out(vty, " metric %u", redist->metric); vty_out(vty, " metric %u", redist->metric);
if (redist->map_name) if (redist->map_name)
vty_out(vty, " route-map %s", redist->map_name); vty_out(vty, " route-map %s", redist->map_name);