Module Name: src
Committed By: bouyer
Date: Wed Sep 28 20:24:06 UTC 2016
Modified Files:
src/sys/netinet6 [netbsd-7]: in6_pcb.c raw_ip6.c
Log Message:
Pull up following revision(s) (requested by roy in ticket #1243):
sys/netinet6/raw_ip6.c: revision 1.150 via patch
sys/netinet6/in6_pcb.c: revision 1.149 via patch
Allow explicit binding to detached addresss.
Fixes PR kern/51435.
To generate a diff of this commit:
cvs rdiff -u -r1.128.2.2 -r1.128.2.3 src/sys/netinet6/in6_pcb.c
cvs rdiff -u -r1.136 -r1.136.2.1 src/sys/netinet6/raw_ip6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/in6_pcb.c
diff -u src/sys/netinet6/in6_pcb.c:1.128.2.2 src/sys/netinet6/in6_pcb.c:1.128.2.3
--- src/sys/netinet6/in6_pcb.c:1.128.2.2 Sat Jan 17 12:10:54 2015
+++ src/sys/netinet6/in6_pcb.c Wed Sep 28 20:24:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_pcb.c,v 1.128.2.2 2015/01/17 12:10:54 martin Exp $ */
+/* $NetBSD: in6_pcb.c,v 1.128.2.3 2016/09/28 20:24:06 bouyer Exp $ */
/* $KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.128.2.2 2015/01/17 12:10:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.128.2.3 2016/09/28 20:24:06 bouyer Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -253,7 +253,7 @@ in6_pcbbind_addr(struct in6pcb *in6p, st
*/
if (ia &&
((struct in6_ifaddr *)ia)->ia6_flags &
- (IN6_IFF_ANYCAST|IN6_IFF_NOTREADY|IN6_IFF_DETACHED))
+ (IN6_IFF_ANYCAST|IN6_IFF_NOTREADY))
return (EADDRNOTAVAIL);
}
Index: src/sys/netinet6/raw_ip6.c
diff -u src/sys/netinet6/raw_ip6.c:1.136 src/sys/netinet6/raw_ip6.c:1.136.2.1
--- src/sys/netinet6/raw_ip6.c:1.136 Sat Aug 9 05:33:01 2014
+++ src/sys/netinet6/raw_ip6.c Wed Sep 28 20:24:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip6.c,v 1.136 2014/08/09 05:33:01 rtr Exp $ */
+/* $NetBSD: raw_ip6.c,v 1.136.2.1 2016/09/28 20:24:06 bouyer Exp $ */
/* $KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.136 2014/08/09 05:33:01 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.136.2.1 2016/09/28 20:24:06 bouyer Exp $");
#include "opt_ipsec.h"
@@ -683,8 +683,7 @@ rip6_bind(struct socket *so, struct mbuf
(ia = ifa_ifwithaddr((struct sockaddr *)addr)) == 0)
return EADDRNOTAVAIL;
if (ia && ((struct in6_ifaddr *)ia)->ia6_flags &
- (IN6_IFF_ANYCAST|IN6_IFF_NOTREADY|
- IN6_IFF_DETACHED|IN6_IFF_DEPRECATED))
+ (IN6_IFF_ANYCAST|IN6_IFF_NOTREADY))
return EADDRNOTAVAIL;
in6p->in6p_laddr = addr->sin6_addr;
return 0;
