diff options
Diffstat (limited to 'zebra/zebra_static.c')
| -rw-r--r-- | zebra/zebra_static.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/zebra/zebra_static.c b/zebra/zebra_static.c index 4628d11091..81c6f1911a 100644 --- a/zebra/zebra_static.c +++ b/zebra/zebra_static.c @@ -83,7 +83,7 @@ static_install_route (afi_t afi, safi_t safi, struct prefix *p, nh_p.u.prefix4 = si->addr.ipv4; zebra_register_rnh_static_nh(si->vrf_id, &nh_p, rn); break; - case STATIC_IFINDEX: + case STATIC_IFNAME: nexthop = rib_nexthop_ifindex_add (rib, si->ifindex); break; case STATIC_BLACKHOLE: @@ -96,7 +96,7 @@ static_install_route (afi_t afi, safi_t safi, struct prefix *p, nh_p.u.prefix6 = si->addr.ipv6; zebra_register_rnh_static_nh(si->vrf_id, &nh_p, rn); break; - case STATIC_IPV6_GATEWAY_IFINDEX: + case STATIC_IPV6_GATEWAY_IFNAME: nexthop = rib_nexthop_ipv6_ifindex_add (rib, &si->addr.ipv6, si->ifindex); break; @@ -147,7 +147,7 @@ static_install_route (afi_t afi, safi_t safi, struct prefix *p, nh_p.u.prefix4 = si->addr.ipv4; zebra_register_rnh_static_nh(si->vrf_id, &nh_p, rn); break; - case STATIC_IFINDEX: + case STATIC_IFNAME: nexthop = rib_nexthop_ifindex_add (rib, si->ifindex); break; case STATIC_BLACKHOLE: @@ -160,7 +160,7 @@ static_install_route (afi_t afi, safi_t safi, struct prefix *p, nh_p.u.prefix6 = si->addr.ipv6; zebra_register_rnh_static_nh(si->vrf_id, &nh_p, rn); break; - case STATIC_IPV6_GATEWAY_IFINDEX: + case STATIC_IPV6_GATEWAY_IFNAME: nexthop = rib_nexthop_ipv6_ifindex_add (rib, &si->addr.ipv6, si->ifindex); break; @@ -209,7 +209,7 @@ static_nexthop_same (struct nexthop *nexthop, struct static_route *si) && IPV4_ADDR_SAME (&nexthop->gate.ipv4, &si->addr.ipv4)) return 1; else if (nexthop->type == NEXTHOP_TYPE_IFINDEX - && si->type == STATIC_IFINDEX + && si->type == STATIC_IFNAME && nexthop->ifindex == si->ifindex) return 1; else if (nexthop->type == NEXTHOP_TYPE_IPV6 @@ -217,7 +217,7 @@ static_nexthop_same (struct nexthop *nexthop, struct static_route *si) && IPV6_ADDR_SAME (&nexthop->gate.ipv6, &si->addr.ipv6)) return 1; else if (nexthop->type == NEXTHOP_TYPE_IPV6_IFINDEX - && si->type == STATIC_IPV6_GATEWAY_IFINDEX + && si->type == STATIC_IPV6_GATEWAY_IFNAME && IPV6_ADDR_SAME (&nexthop->gate.ipv6, &si->addr.ipv6) && nexthop->ifindex == si->ifindex) return 1; @@ -359,12 +359,12 @@ static_add_route (afi_t afi, safi_t safi, u_char type, struct prefix *p, if (!gate && (type == STATIC_IPV4_GATEWAY || type == STATIC_IPV6_GATEWAY || - type == STATIC_IPV6_GATEWAY_IFINDEX)) + type == STATIC_IPV6_GATEWAY_IFNAME)) return -1; if (!ifindex && - (type == STATIC_IFINDEX || - type == STATIC_IPV6_GATEWAY_IFINDEX)) + (type == STATIC_IFNAME || + type == STATIC_IPV6_GATEWAY_IFNAME)) return -1; /* Lookup static route prefix. */ @@ -416,10 +416,10 @@ static_add_route (afi_t afi, safi_t safi, u_char type, struct prefix *p, case STATIC_IPV6_GATEWAY: si->addr.ipv6 = gate->ipv6; break; - case STATIC_IPV6_GATEWAY_IFINDEX: + case STATIC_IPV6_GATEWAY_IFNAME: si->addr.ipv6 = gate->ipv6; break; - case STATIC_IFINDEX: + case STATIC_IFNAME: break; } |