silence some of log(), as the codepath will be visited for IPv6-non-capable

interfaces too and can be annoying.  net.inet6.icmp6.nd6_debug will
re-enable them.

1 files changed, 19 insertions, 19 deletions

diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index 33f19d8ece6..6a232cf6aa6 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6.c,v 1.44 2002/06/09 14:38:39 itojun Exp $	*/
+/*	$OpenBSD: in6.c,v 1.45 2002/06/11 07:36:00 itojun Exp $	*/
 /*	$KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $	*/
 
 /*
@@ -877,13 +877,13 @@ in6_update_ifa(ifp, ifra, ia)
 
 		if ((ifp->if_flags & (IFF_POINTOPOINT|IFF_LOOPBACK)) == 0) {
 			/* XXX: noisy message */
-			log(LOG_INFO, "in6_update_ifa: a destination can be "
-			    "specified for a p2p or a loopback IF only\n");
+			nd6log((LOG_INFO, "in6_update_ifa: a destination can be "
+			    "specified for a p2p or a loopback IF only\n"));
 			return(EINVAL);
 		}
 		if (plen != 128) {
-			log(LOG_INFO, "in6_update_ifa: prefixlen should be "
-			    "128 when dstaddr is specified\n");
+			nd6log((LOG_INFO, "in6_update_ifa: prefixlen should be "
+			    "128 when dstaddr is specified\n"));
 #ifdef FORCE_P2PPLEN
 			/*
 			 * To be compatible with old configurations,
@@ -911,9 +911,9 @@ in6_update_ifa(ifp, ifra, ia)
 		 * the following log might be noisy, but this is a typical
 		 * configuration mistake or a tool's bug.
 		 */
-		log(LOG_INFO,
+		nd6log((LOG_INFO,
 		    "in6_update_ifa: valid lifetime is 0 for %s\n",
-		    ip6_sprintf(&ifra->ifra_addr.sin6_addr));
+		    ip6_sprintf(&ifra->ifra_addr.sin6_addr)));
 
 		if (ia == NULL)
 			return(0); /* there's nothing to do */
@@ -975,9 +975,9 @@ in6_update_ifa(ifp, ifra, ia)
 		 */
 		if (ia->ia_prefixmask.sin6_len &&
 		    in6_mask2len(&ia->ia_prefixmask.sin6_addr, NULL) != plen) {
-			log(LOG_INFO, "in6_update_ifa: the prefix length of an"
+			nd6log((LOG_INFO, "in6_update_ifa: the prefix length of an"
 			    " existing (%s) address should not be changed\n",
-			    ip6_sprintf(&ia->ia_addr.sin6_addr));
+			    ip6_sprintf(&ia->ia_addr.sin6_addr)));
 			error = EINVAL;
 			goto unlink;
 		}
@@ -995,9 +995,9 @@ in6_update_ifa(ifp, ifra, ia)
 
 		if ((ia->ia_flags & IFA_ROUTE) != 0 &&
 		    (e = rtinit(&(ia->ia_ifa), (int)RTM_DELETE, RTF_HOST)) != 0) {
-			log(LOG_ERR, "in6_update_ifa: failed to remove "
+			nd6log((LOG_ERR, "in6_update_ifa: failed to remove "
 			    "a route to the old destination: %s\n",
-			    ip6_sprintf(&ia->ia_addr.sin6_addr));
+			    ip6_sprintf(&ia->ia_addr.sin6_addr)));
 			/* proceed anyway... */
 		} else
 			ia->ia_flags &= ~IFA_ROUTE;
@@ -1065,10 +1065,10 @@ in6_update_ifa(ifp, ifra, ia)
 				LIST_INSERT_HEAD(&ia->ia6_memberships, imm,
 				    i6mm_chain);
 			} else {
-				log(LOG_ERR, "in6_update_ifa: addmulti "
+				nd6log((LOG_ERR, "in6_update_ifa: addmulti "
 				    "failed for %s on %s (errno=%d)\n",
 				    ip6_sprintf(&llsol.sin6_addr),
-				    ifp->if_xname, error);
+				    ifp->if_xname, error));
 				goto cleanup;
 			}
 		}
@@ -1133,11 +1133,11 @@ in6_update_ifa(ifp, ifra, ia)
 			LIST_INSERT_HEAD(&ia->ia6_memberships, imm,
 			    i6mm_chain);
 		} else {
-			log(LOG_WARNING,
+			nd6log((LOG_WARNING,
 			    "in6_update_ifa: addmulti failed for "
 			    "%s on %s (errno=%d)\n",
 			    ip6_sprintf(&mltaddr.sin6_addr),
-			    ifp->if_xname, error);
+			    ifp->if_xname, error));
 			goto cleanup;
 		}
 
@@ -1150,10 +1150,10 @@ in6_update_ifa(ifp, ifra, ia)
 				LIST_INSERT_HEAD(&ia->ia6_memberships, imm,
 				    i6mm_chain);
 			} else {
-				log(LOG_WARNING, "in6_update_ifa: "
+				nd6log((LOG_WARNING, "in6_update_ifa: "
 				    "addmulti failed for %s on %s (errno=%d)\n",
 				    ip6_sprintf(&mltaddr.sin6_addr),
-				    ifp->if_xname, error);
+				    ifp->if_xname, error));
 				/* XXX not very fatal, go on... */
 			}
 		}
@@ -1199,11 +1199,11 @@ in6_update_ifa(ifp, ifra, ia)
 				LIST_INSERT_HEAD(&ia->ia6_memberships, imm,
 				    i6mm_chain);
 			} else {
-				log(LOG_WARNING, "in6_update_ifa: "
+				nd6log((LOG_WARNING, "in6_update_ifa: "
 				    "addmulti failed for %s on %s "
 				    "(errno=%d)\n",
 				    ip6_sprintf(&mltaddr.sin6_addr),
-				    ifp->if_xname, error);
+				    ifp->if_xname, error));
 				goto cleanup;
 			}
 		}