Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src/sys/netinet6 Pull up following revision(s) (requested by ...
details: https://anonhg.NetBSD.org/src/rev/1ddfc0d40a5d
branches: netbsd-7
changeset: 799987:1ddfc0d40a5d
user: bouyer <bouyer%NetBSD.org@localhost>
date: Wed Sep 28 20:24:06 2016 +0000
description:
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.
diffstat:
sys/netinet6/in6_pcb.c | 6 +++---
sys/netinet6/raw_ip6.c | 7 +++----
2 files changed, 6 insertions(+), 7 deletions(-)
diffs (55 lines):
diff -r d33645c4e8b7 -r 1ddfc0d40a5d sys/netinet6/in6_pcb.c
--- a/sys/netinet6/in6_pcb.c Sun Sep 25 12:25:13 2016 +0000
+++ b/sys/netinet6/in6_pcb.c Wed Sep 28 20:24:06 2016 +0000
@@ -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 @@
*/
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);
}
diff -r d33645c4e8b7 -r 1ddfc0d40a5d sys/netinet6/raw_ip6.c
--- a/sys/netinet6/raw_ip6.c Sun Sep 25 12:25:13 2016 +0000
+++ b/sys/netinet6/raw_ip6.c Wed Sep 28 20:24:06 2016 +0000
@@ -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 @@
(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;
Home |
Main Index |
Thread Index |
Old Index