diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2013-06-01 16:22:06 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2013-06-01 16:22:06 +0000 |
| commit | 51a166362649e2fe7de4dd395ebd8018574499c0 (patch) | |
| tree | b596ebb8beefa61975729bb0996eb8005877b0bb /sys/netinet6/icmp6.c | |
| parent | 6c767d473d124564aa10591e9b7250fa0f9b7ee7 (diff) | |
Pass the routing domain to IPv6 pr_ctlinput() like in IPv4.
OK claudio@
Diffstat (limited to 'sys/netinet6/icmp6.c')
| -rw-r--r-- | sys/netinet6/icmp6.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 99d76239011..d0911355365 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: icmp6.c,v 1.127 2013/05/31 15:04:23 bluhm Exp $ */ +/* $OpenBSD: icmp6.c,v 1.128 2013/06/01 16:22:05 bluhm Exp $ */ /* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */ /* @@ -892,7 +892,7 @@ icmp6_notify_error(struct mbuf *m, int off, int icmp6len, int code) /* Detect the upper level protocol */ { - void (*ctlfunc)(int, struct sockaddr *, void *); + void (*ctlfunc)(int, struct sockaddr *, u_int, void *); u_int8_t nxt = eip6->ip6_nxt; int eoff = off + sizeof(struct icmp6_hdr) + sizeof(struct ip6_hdr); @@ -1062,10 +1062,10 @@ icmp6_notify_error(struct mbuf *m, int off, int icmp6len, int code) ip6cp.ip6c_cmdarg = (void *)¬ifymtu; } - ctlfunc = (void (*)(int, struct sockaddr *, void *)) - (inet6sw[ip6_protox[nxt]].pr_ctlinput); + ctlfunc = inet6sw[ip6_protox[nxt]].pr_ctlinput; if (ctlfunc) - (void) (*ctlfunc)(code, sin6tosa(&icmp6dst), &ip6cp); + (*ctlfunc)(code, sin6tosa(&icmp6dst), + m->m_pkthdr.rdomain, &ip6cp); } return (0); |