zebra: replace 0 value on zebra with VRF_DEFAULT

On some places of code, the VRF_DEFAULT define was not used. This commit
is ensuring that the macros is well used.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

diff --git a/zebra/zebra_static.c b/zebra/zebra_static.c
index 751ea08a381eecbf0e0348b1351bd7ae77d53aa8..3dd5378f22a360b9eddf35df26d7b5974f852524 100644 (file)
--- a/zebra/zebra_static.c
+++ b/zebra/zebra_static.c
@@ -156,7 +156,7 @@ void static_install_route(afi_t afi, safi_t safi, struct prefix *p,
                re->mtu = 0;
                re->vrf_id = si->vrf_id;
                re->table =
-                       si->vrf_id
+                       (si->vrf_id != VRF_DEFAULT)
                                ? (zebra_vrf_lookup_by_id(si->vrf_id))->table_id
                                : zebrad.rtm_table_default;
                re->nexthop_num = 0;

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 82b0157ad377ae8cca95fff71f6af55549d49c73..df461ab10c1f77d48472b8fb346e865d0b1eb688 100644 (file)
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -1181,7 +1181,7 @@ DEFUN (ip_nht_default_route,
                return CMD_SUCCESS;
 
        zebra_rnh_ip_default_route = 1;
-       zebra_evaluate_rnh(0, AF_INET, 1, RNH_NEXTHOP_TYPE, NULL);
+       zebra_evaluate_rnh(VRF_DEFAULT, AF_INET, 1, RNH_NEXTHOP_TYPE, NULL);
        return CMD_SUCCESS;
 }
 
@@ -1197,7 +1197,7 @@ DEFUN (no_ip_nht_default_route,
                return CMD_SUCCESS;
 
        zebra_rnh_ip_default_route = 0;
-       zebra_evaluate_rnh(0, AF_INET, 1, RNH_NEXTHOP_TYPE, NULL);
+       zebra_evaluate_rnh(VRF_DEFAULT, AF_INET, 1, RNH_NEXTHOP_TYPE, NULL);
        return CMD_SUCCESS;
 }
 
@@ -1212,7 +1212,7 @@ DEFUN (ipv6_nht_default_route,
                return CMD_SUCCESS;
 
        zebra_rnh_ipv6_default_route = 1;
-       zebra_evaluate_rnh(0, AF_INET6, 1, RNH_NEXTHOP_TYPE, NULL);
+       zebra_evaluate_rnh(VRF_DEFAULT, AF_INET6, 1, RNH_NEXTHOP_TYPE, NULL);
        return CMD_SUCCESS;
 }
 
@@ -1228,7 +1228,7 @@ DEFUN (no_ipv6_nht_default_route,
                return CMD_SUCCESS;
 
        zebra_rnh_ipv6_default_route = 0;
-       zebra_evaluate_rnh(0, AF_INET6, 1, RNH_NEXTHOP_TYPE, NULL);
+       zebra_evaluate_rnh(VRF_DEFAULT, AF_INET6, 1, RNH_NEXTHOP_TYPE, NULL);
        return CMD_SUCCESS;
 }
 
@@ -1890,7 +1890,7 @@ DEFUN (show_vrf,
        RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
                if (!(zvrf = vrf->info))
                        continue;
-               if (!zvrf_id(zvrf))
+               if (zvrf_id(zvrf) == VRF_DEFAULT)
                        continue;
 
                vty_out(vty, "vrf %s ", zvrf_name(zvrf));