diff options
| author | Peter Hessler <phessler@cvs.openbsd.org> | 2013-10-20 11:03:04 +0000 |
|---|---|---|
| committer | Peter Hessler <phessler@cvs.openbsd.org> | 2013-10-20 11:03:04 +0000 |
| commit | 51af3a791d7649a044d750e62f6fadb6a19a067f (patch) | |
| tree | 89492abc1a604c6e28a2e0a804e6e0a16891f066 /sys/netinet/tcp_subr.c | |
| parent | 5d95e5679b62bf050ffb3997ec86ef7f5f611b9a (diff) | |
Put a large chunk of the IPv6 rdomain support in-tree.
Still some important missing pieces, and this is not yet enabled.
OK bluhm@
Diffstat (limited to 'sys/netinet/tcp_subr.c')
| -rw-r--r-- | sys/netinet/tcp_subr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 1546619145c..3bb7f08f688 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_subr.c,v 1.121 2013/10/19 10:38:55 henning Exp $ */ +/* $OpenBSD: tcp_subr.c,v 1.122 2013/10/20 11:03:01 phessler Exp $ */ /* $NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $ */ /* @@ -728,7 +728,7 @@ tcp6_ctlinput(int cmd, struct sockaddr *sa, u_int rdomain, void *d) */ inp = in6_pcbhashlookup(&tcbtable, &sa6->sin6_addr, th.th_dport, (struct in6_addr *)&sa6_src->sin6_addr, - th.th_sport); + th.th_sport, rdomain); if (cmd == PRC_MSGSIZE) { /* * Depending on the value of "valid" and routing table @@ -752,10 +752,10 @@ tcp6_ctlinput(int cmd, struct sockaddr *sa, u_int rdomain, void *d) inet6ctlerrmap[cmd] == ENETUNREACH || inet6ctlerrmap[cmd] == EHOSTDOWN)) syn_cache_unreach((struct sockaddr *)sa6_src, - sa, &th, /* XXX */ 0); + sa, &th, rdomain); } else { (void) in6_pcbnotify(&tcbtable, sa6, 0, - sa6_src, 0, cmd, NULL, notify); + sa6_src, 0, rdomain, cmd, NULL, notify); } } #endif @@ -901,7 +901,7 @@ tcp6_mtudisc_callback(faddr) sin6.sin6_len = sizeof(struct sockaddr_in6); sin6.sin6_addr = *faddr; (void) in6_pcbnotify(&tcbtable, &sin6, 0, - &sa6_any, 0, PRC_MSGSIZE, NULL, tcp_mtudisc); + &sa6_any, 0, /* XXX rdomain */ 0, PRC_MSGSIZE, NULL, tcp_mtudisc); } #endif /* INET6 */ |