[src/netbsd-1-5]: src/sys/netinet6 Pull up revision 1.53 (via patch, requeste...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e62fdd471cea
branches:  netbsd-1-5
changeset: 491702:e62fdd471cea
user:      he <he%NetBSD.org@localhost>
date:      Wed May 09 19:42:09 2001 +0000

description:
Pull up revision 1.53 (via patch, requested by itojun):
  Suppress ND6 logs that are too noisy for normal use.  Can be
  re-enabled by net.inet6.icmp6.nd6_debug.

diffstat:

 sys/netinet6/icmp6.c |  39 ++++++++++++++++++++-------------------
 1 files changed, 20 insertions(+), 19 deletions(-)

diffs (119 lines):

diff -r e3318d7aebf1 -r e62fdd471cea sys/netinet6/icmp6.c
--- a/sys/netinet6/icmp6.c      Wed May 09 19:38:47 2001 +0000
+++ b/sys/netinet6/icmp6.c      Wed May 09 19:42:09 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: icmp6.c,v 1.33.2.13 2001/05/09 19:38:03 he Exp $       */
+/*     $NetBSD: icmp6.c,v 1.33.2.14 2001/05/09 19:42:09 he Exp $       */
 /*     $KAME: icmp6.c,v 1.146 2000/10/01 12:37:20 itojun Exp $ */
 
 /*
@@ -1981,16 +1981,16 @@
 
        /* validation */
        if (!IN6_IS_ADDR_LINKLOCAL(&src6)) {
-               log(LOG_ERR,
+               nd6log((LOG_ERR,
                        "ICMP6 redirect sent from %s rejected; "
-                       "must be from linklocal\n", ip6_sprintf(&src6));
+                       "must be from linklocal\n", ip6_sprintf(&src6)));
                goto freeit;
        }
        if (ip6->ip6_hlim != 255) {
-               log(LOG_ERR,
+               nd6log((LOG_ERR,
                        "ICMP6 redirect sent from %s rejected; "
                        "hlim=%d (must be 255)\n",
-                       ip6_sprintf(&src6), ip6->ip6_hlim);
+                       ip6_sprintf(&src6), ip6->ip6_hlim));
                goto freeit;
        }
     {
@@ -2006,40 +2006,40 @@
        if (rt) {
                if (rt->rt_gateway == NULL ||
                    rt->rt_gateway->sa_family != AF_INET6) {
-                       log(LOG_ERR,
+                       nd6log((LOG_ERR,
                            "ICMP6 redirect rejected; no route "
                            "with inet6 gateway found for redirect dst: %s\n",
-                           icmp6_redirect_diag(&src6, &reddst6, &redtgt6));
+                           icmp6_redirect_diag(&src6, &reddst6, &redtgt6)));
                        RTFREE(rt);
                        goto freeit;
                }
 
                gw6 = &(((struct sockaddr_in6 *)rt->rt_gateway)->sin6_addr);
                if (bcmp(&src6, gw6, sizeof(struct in6_addr)) != 0) {
-                       log(LOG_ERR,
+                       nd6log((LOG_ERR,
                                "ICMP6 redirect rejected; "
                                "not equal to gw-for-src=%s (must be same): "
                                "%s\n",
                                ip6_sprintf(gw6),
-                               icmp6_redirect_diag(&src6, &reddst6, &redtgt6));
+                               icmp6_redirect_diag(&src6, &reddst6, &redtgt6)));
                        RTFREE(rt);
                        goto freeit;
                }
        } else {
-               log(LOG_ERR,
+               nd6log((LOG_ERR,
                        "ICMP6 redirect rejected; "
                        "no route found for redirect dst: %s\n",
-                       icmp6_redirect_diag(&src6, &reddst6, &redtgt6));
+                       icmp6_redirect_diag(&src6, &reddst6, &redtgt6)));
                goto freeit;
        }
        RTFREE(rt);
        rt = NULL;
     }
        if (IN6_IS_ADDR_MULTICAST(&reddst6)) {
-               log(LOG_ERR,
+               nd6log((LOG_ERR,
                        "ICMP6 redirect rejected; "
                        "redirect dst must be unicast: %s\n",
-                       icmp6_redirect_diag(&src6, &reddst6, &redtgt6));
+                       icmp6_redirect_diag(&src6, &reddst6, &redtgt6)));
                goto freeit;
        }
 
@@ -2049,10 +2049,10 @@
        if (bcmp(&redtgt6, &reddst6, sizeof(redtgt6)) == 0)
                is_onlink = 1;  /* on-link destination case */
        if (!is_router && !is_onlink) {
-               log(LOG_ERR,
+               nd6log((LOG_ERR,
                        "ICMP6 redirect rejected; "
                        "neither router case nor onlink case: %s\n",
-                       icmp6_redirect_diag(&src6, &reddst6, &redtgt6));
+                       icmp6_redirect_diag(&src6, &reddst6, &redtgt6)));
                goto freeit;
        }
        /* validation passed */
@@ -2060,9 +2060,9 @@
        icmp6len -= sizeof(*nd_rd);
        nd6_option_init(nd_rd + 1, icmp6len, &ndopts);
        if (nd6_options(&ndopts) < 0) {
-               log(LOG_INFO, "icmp6_redirect_input: "
+               nd6log((LOG_INFO, "icmp6_redirect_input: "
                        "invalid ND option, rejected: %s\n",
-                       icmp6_redirect_diag(&src6, &reddst6, &redtgt6));
+                       icmp6_redirect_diag(&src6, &reddst6, &redtgt6)));
                goto freeit;
        }
 
@@ -2077,11 +2077,12 @@
        }
 
        if (lladdr && ((ifp->if_addrlen + 2 + 7) & ~7) != lladdrlen) {
-               log(LOG_INFO,
+               nd6log((LOG_INFO,
                        "icmp6_redirect_input: lladdrlen mismatch for %s "
                        "(if %d, icmp6 packet %d): %s\n",
                        ip6_sprintf(&redtgt6), ifp->if_addrlen, lladdrlen - 2,
-                       icmp6_redirect_diag(&src6, &reddst6, &redtgt6));
+                       icmp6_redirect_diag(&src6, &reddst6, &redtgt6)));
+               goto freeit;
        }
 
        /* RFC 2461 8.3 */