diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-06-26 16:44:50 +0200 |
|---|---|---|
| committer | Renato Westphal <renato@opensourcerouting.org> | 2017-09-12 15:59:07 +0200 |
| commit | c710b277cfde65fab8ae071fd80992e836bff7f2 (patch) | |
| tree | 4335e6f6ace9d85ed901bb24828a35a92ca4f066 /zebra | |
| parent | Merge pull request #1154 from donaldsharp/bgp_aspath (diff) | |
| download | frr-c710b277cfde65fab8ae071fd80992e836bff7f2.tar.xz frr-c710b277cfde65fab8ae071fd80992e836bff7f2.zip | |
zebra: Fix up default admin distance for some route types
Set the default admin distance for some route types
more appropriately. The route_distance function
would return 0 for array items not configured, which
is not the right thing to do.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/zebra_rib.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index c4c80b156..e0c92801c 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -78,7 +78,20 @@ static const struct { [ZEBRA_ROUTE_OSPF6] = {ZEBRA_ROUTE_OSPF6, 110}, [ZEBRA_ROUTE_ISIS] = {ZEBRA_ROUTE_ISIS, 115}, [ZEBRA_ROUTE_BGP] = {ZEBRA_ROUTE_BGP, 20 /* IBGP is 200. */}, + [ZEBRA_ROUTE_PIM] = {ZEBRA_ROUTE_PIM, 255}, + [ZEBRA_ROUTE_EIGRP] = {ZEBRA_ROUTE_EIGRP, 90}, [ZEBRA_ROUTE_NHRP] = {ZEBRA_ROUTE_NHRP, 10}, + [ZEBRA_ROUTE_HSLS] = {ZEBRA_ROUTE_HSLS, 255}, + [ZEBRA_ROUTE_OLSR] = {ZEBRA_ROUTE_OLSR, 255}, + [ZEBRA_ROUTE_TABLE] = {ZEBRA_ROUTE_TABLE, 150}, + [ZEBRA_ROUTE_LDP] = {ZEBRA_ROUTE_LDP, 150}, + [ZEBRA_ROUTE_VNC] = {ZEBRA_ROUTE_VNC, 20}, + [ZEBRA_ROUTE_VNC_DIRECT] = {ZEBRA_ROUTE_VNC_DIRECT, 20}, + [ZEBRA_ROUTE_VNC_DIRECT_RH] = {ZEBRA_ROUTE_VNC_DIRECT_RH, 20}, + [ZEBRA_ROUTE_BGP_DIRECT] = {ZEBRA_ROUTE_BGP_DIRECT, 20}, + [ZEBRA_ROUTE_BGP_DIRECT_EXT] = {ZEBRA_ROUTE_BGP_DIRECT_EXT, 20}, + [ZEBRA_ROUTE_BABEL] = {ZEBRA_ROUTE_BABEL, 100}, + /* no entry/default: 150 */ }; |