diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2010-05-07 13:33:18 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2010-05-07 13:33:18 +0000 |
| commit | 043b0fc8cb63b379ff2757ab2d64bf2b4c8c2cb7 (patch) | |
| tree | 18ea5d2f321a9a8ea43ecdd326acada9de6ae943 /sys/netinet6/in6_src.c | |
| parent | 6bcd6fa8c9cab428fd9f7d850e1771ff3f94d451 (diff) | |
Start cleaning up the mess called rtalloc*. Kill rtalloc2, make rtalloc1
accept flags for report and nocloning. Move the rtableid into struct route
(with a minor twist for now) and make a few more codepathes rdomain aware.
Appart from the pf.c and route.c bits the diff is mostly mechanical.
More to come...
OK michele, henning
Diffstat (limited to 'sys/netinet6/in6_src.c')
| -rw-r--r-- | sys/netinet6/in6_src.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c index dc172a904f0..e0cdfbf31eb 100644 --- a/sys/netinet6/in6_src.c +++ b/sys/netinet6/in6_src.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_src.c,v 1.24 2010/02/08 12:04:35 jsing Exp $ */ +/* $OpenBSD: in6_src.c,v 1.25 2010/05/07 13:33:17 claudio Exp $ */ /* $KAME: in6_src.c,v 1.36 2001/02/06 04:08:17 itojun Exp $ */ /* @@ -239,10 +239,9 @@ in6_selectsrc(struct sockaddr_in6 *dstsock, struct ip6_pktopts *opts, sa6->sin6_addr = *dst; sa6->sin6_scope_id = dstsock->sin6_scope_id; if (IN6_IS_ADDR_MULTICAST(dst)) { - ro->ro_rt = rtalloc1(&((struct route *)ro) - ->ro_dst, 0, 0); + rtalloc((struct route *)ro); } else { - rtalloc_mpath((struct route *)ro, NULL, 0); + rtalloc_mpath((struct route *)ro, NULL); } } @@ -371,6 +370,7 @@ selectroute(struct sockaddr_in6 *dstsock, struct ip6_pktopts *opts, ron->ro_rt = NULL; } *satosin6(&ron->ro_dst) = *sin6_next; + ron->ro_tableid = 0; /* XXX rtableid */ } if (ron->ro_rt == NULL) { rtalloc((struct route *)ron); /* multi path case? */ @@ -423,7 +423,7 @@ selectroute(struct sockaddr_in6 *dstsock, struct ip6_pktopts *opts, sa6 = (struct sockaddr_in6 *)&ro->ro_dst; *sa6 = *dstsock; sa6->sin6_scope_id = 0; - rtalloc_mpath((struct route *)ro, NULL, 0); + rtalloc_mpath((struct route *)ro, NULL); } /* |