Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/netinet6 explain why in6_setscope fails...
details: https://anonhg.NetBSD.org/src/rev/258ad8b2de4e
branches: trunk
changeset: 356325:258ad8b2de4e
user: christos <christos%NetBSD.org@localhost>
date: Sun Sep 17 17:36:06 2017 +0000
description:
explain why in6_setscope fails...
diffstat:
sys/netinet6/scope6.c | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diffs (68 lines):
diff -r 44175cc39105 -r 258ad8b2de4e sys/netinet6/scope6.c
--- a/sys/netinet6/scope6.c Sun Sep 17 17:35:10 2017 +0000
+++ b/sys/netinet6/scope6.c Sun Sep 17 17:36:06 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: scope6.c,v 1.17 2017/01/16 15:44:47 christos Exp $ */
+/* $NetBSD: scope6.c,v 1.18 2017/09/17 17:36:06 christos Exp $ */
/* $KAME$ */
/*-
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.17 2017/01/16 15:44:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.18 2017/09/17 17:36:06 christos Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -42,6 +42,7 @@
#include <sys/syslog.h>
#include <net/if.h>
+#include <net/net_osdep.h>
#include <netinet/in.h>
@@ -347,7 +348,7 @@
if (sin6->sin6_scope_id != 0) {
log(LOG_NOTICE,
- "sa6_recoverscope: assumption failure (non 0 ID): %s%%%d\n",
+ "%s: assumption failure (non 0 ID): %s%%%d\n", __func__,
IN6_PRINT(ip6buf, &sin6->sin6_addr), sin6->sin6_scope_id);
/* XXX: proceed anyway... */
}
@@ -393,20 +394,27 @@
uint32_t zoneid = 0;
const struct scope6_id *sid = SID(ifp);
- if (sid == NULL)
+ if (sid == NULL) {
+ log(LOG_NOTICE, "%s: no scope id for %s\n", __func__,
+ if_name(ifp));
return EINVAL;
+ }
/*
* special case: the loopback address can only belong to a loopback
* interface.
*/
if (IN6_IS_ADDR_LOOPBACK(in6)) {
- if (!(ifp->if_flags & IFF_LOOPBACK))
- return (EINVAL);
- else {
+ if (!(ifp->if_flags & IFF_LOOPBACK)) {
+ char ip6buf[INET6_ADDRSTRLEN];
+ log(LOG_NOTICE, "%s: can't set scope for not loopback "
+ "interface %s and loopback address %s\n",
+ __func__, if_name(ifp), IN6_PRINT(ip6buf, in6));
+ return EINVAL;
+ } else {
if (ret_id != NULL)
*ret_id = 0; /* there's no ambiguity */
- return (0);
+ return 0;
}
}
Home |
Main Index |
Thread Index |
Old Index