diff options
| author |   renato <renato@openbsd.org> | 2016-01-15 12:56:12 +0000 |
|---|---|---|
| committer | renato <renato@openbsd.org> | 2016-01-15 12:56:12 +0000 |
| commit | 86a69727cf4617cdff7e2af3c771a1c7903ffa9d (patch) | |
| tree | 3f50af16db80c7cec14176e866567e4129282d05 /usr.sbin/eigrpd | |
| parent | Better handle explicit nexthops. (diff) | |
| download | wireguard-openbsd-86a69727cf4617cdff7e2af3c771a1c7903ffa9d.tar.xz wireguard-openbsd-86a69727cf4617cdff7e2af3c771a1c7903ffa9d.zip | |
For each prefix, order routes by their nexthop.
Diffstat (limited to 'usr.sbin/eigrpd')
| -rw-r--r-- | usr.sbin/eigrpd/rde_dual.c | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/usr.sbin/eigrpd/rde_dual.c b/usr.sbin/eigrpd/rde_dual.c index e810c5a5c59..3f45b9fbdd8 100644 --- a/usr.sbin/eigrpd/rde_dual.c +++ b/usr.sbin/eigrpd/rde_dual.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_dual.c,v 1.17 2016/01/15 12:52:49 renato Exp $ */ +/* $OpenBSD: rde_dual.c,v 1.18 2016/01/15 12:56:12 renato Exp $ */ /* * Copyright (c) 2015 Renato Westphal <renato@openbsd.org> @@ -260,7 +260,7 @@ struct eigrp_route * route_new(struct rt_node *rn, struct rde_nbr *nbr, struct rinfo *ri) { struct eigrp *eigrp = rn->eigrp; - struct eigrp_route *route; + struct eigrp_route *route, *tmp; if ((route = calloc(1, sizeof(*route))) == NULL) fatal("route_new"); @@ -272,7 +272,30 @@ route_new(struct rt_node *rn, struct rde_nbr *nbr, struct rinfo *ri) else memcpy(&route->nexthop, &nbr->addr, sizeof(route->nexthop)); route_update_metrics(eigrp, route, ri); - TAILQ_INSERT_TAIL(&rn->routes, route, entry); + + /* order by nexthop */ + TAILQ_FOREACH(tmp, &rn->routes, entry) { + switch (eigrp->af) { + case AF_INET: + if (ntohl(tmp->nexthop.v4.s_addr) > + ntohl(route->nexthop.v4.s_addr)) + goto insert; + break; + case AF_INET6: + if (memcmp(&tmp->nexthop.v6.s6_addr[0], + &route->nexthop.v6.s6_addr[0], + sizeof(struct in6_addr)) > 0) + goto insert; + break; + default: + fatalx("route_new: unknown af"); + } + } +insert: + if (tmp) + TAILQ_INSERT_BEFORE(tmp, route, entry); + else + TAILQ_INSERT_TAIL(&rn->routes, route, entry); log_debug("%s: prefix %s via %s distance (%u/%u)", __func__, log_prefix(rn), route_print_origin(eigrp->af, route->nbr), |