isisd: use 0 as default-metric for redistribution

Signed-off-by: Christian Franke <chris@opensourcerouting.org>

diff --git a/isisd/isis_redist.c b/isisd/isis_redist.c
index 9c61512df4f71c6e318387a76b06ee7dc96d2232..e903dc8c7fea87d8dfd97c676b7c57e480f7f8d9 100644 (file)
--- a/isisd/isis_redist.c
+++ b/isisd/isis_redist.c
@@ -184,8 +184,7 @@ static void isis_redist_update_ext_reach(struct isis_area *area, int level,
        route_map_result_t map_ret;
 
        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) {
                map_ret =
@@ -540,7 +539,7 @@ DEFUN (isis_redistribute,
        int afi;
        int type;
        int level;
-       unsigned long metric;
+       unsigned long metric = 0;
        const char *routemap = NULL;
 
        family = str2family(argv[idx_afi]->text);
@@ -567,9 +566,6 @@ DEFUN (isis_redistribute,
                return CMD_WARNING_CONFIG_FAILED;
        }
 
-       metric = 0xffffffff;
-       routemap = NULL;
-
        if (argc > idx_metric_rmap + 1) {
                if (argv[idx_metric_rmap + 1]->arg[0] == '\0')
                        return CMD_WARNING_CONFIG_FAILED;
@@ -651,7 +647,7 @@ DEFUN (isis_default_originate,
        int family;
        int originate_type = DEFAULT_ORIGINATE;
        int level;
-       unsigned long metric = 0xffffffff;
+       unsigned long metric = 0;
        const char *routemap = NULL;
 
        family = str2family(argv[idx_afi]->text);
@@ -748,7 +744,7 @@ int isis_redist_config_write(struct vty *vty, struct isis_area *area,
                                continue;
                        vty_out(vty, " redistribute %s %s level-%d", family_str,
                                zebra_route_string(type), level);
-                       if (redist->metric != 0xffffffff)
+                       if (redist->metric)
                                vty_out(vty, " metric %u", redist->metric);
                        if (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);
                if (redist->redist == DEFAULT_ORIGINATE_ALWAYS)
                        vty_out(vty, " always");
-               if (redist->metric != 0xffffffff)
+               if (redist->metric)
                        vty_out(vty, " metric %u", redist->metric);
                if (redist->map_name)
                        vty_out(vty, " route-map %s", redist->map_name);