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

zebra: replace 0 value on zebra with VRF_DEFAULT

Browse Source 
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>
This commit is contained in:
Philippe Guibert 2018-01-22 09:38:45 +01:00
parent 2fcdb1b2d1
commit 90ac32c209
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zebra/zebra_static.c
View File

@ -156,7 +156,7 @@ void static_install_route(afi_t afi, safi_t safi, struct prefix *p,
re->mtu = 0; re->mtu = 0;
re->vrf_id = si->vrf_id; re->vrf_id = si->vrf_id;
re->table = re->table =
si->vrf_id (si->vrf_id != VRF_DEFAULT)
? (zebra_vrf_lookup_by_id(si->vrf_id))->table_id ? (zebra_vrf_lookup_by_id(si->vrf_id))->table_id
: zebrad.rtm_table_default; : zebrad.rtm_table_default;
re->nexthop_num = 0; re->nexthop_num = 0;

10
zebra/zebra_vty.c
View File

@ -1181,7 +1181,7 @@ DEFUN (ip_nht_default_route,
return CMD_SUCCESS; return CMD_SUCCESS;
zebra_rnh_ip_default_route = 1; 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; return CMD_SUCCESS;
} }
@ -1197,7 +1197,7 @@ DEFUN (no_ip_nht_default_route,
return CMD_SUCCESS; return CMD_SUCCESS;
zebra_rnh_ip_default_route = 0; 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; return CMD_SUCCESS;
} }
@ -1212,7 +1212,7 @@ DEFUN (ipv6_nht_default_route,
return CMD_SUCCESS; return CMD_SUCCESS;
zebra_rnh_ipv6_default_route = 1; 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; return CMD_SUCCESS;
} }
@ -1228,7 +1228,7 @@ DEFUN (no_ipv6_nht_default_route,
return CMD_SUCCESS; return CMD_SUCCESS;
zebra_rnh_ipv6_default_route = 0; 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; return CMD_SUCCESS;
} }
@ -1890,7 +1890,7 @@ DEFUN (show_vrf,
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) { RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (!(zvrf = vrf->info)) if (!(zvrf = vrf->info))
continue; continue;
if (!zvrf_id(zvrf)) if (zvrf_id(zvrf) == VRF_DEFAULT)
continue; continue;
vty_out(vty, "vrf %s ", zvrf_name(zvrf)); vty_out(vty, "vrf %s ", zvrf_name(zvrf));