diff options
author | suz <suz@FreeBSD.org> | 2005-10-19 10:09:19 +0000 |
---|---|---|
committer | suz <suz@FreeBSD.org> | 2005-10-19 10:09:19 +0000 |
commit | 21f42e535fa6a4e118a72f5e8130dfff7456036a (patch) | |
tree | c362eb3bd52a94047053ab1b3c10c895d818bd69 /sys/netinet6/in6_ifattach.c | |
parent | 2043307751112834c9e2c0d1201a38aed095a6da (diff) | |
download | FreeBSD-src-21f42e535fa6a4e118a72f5e8130dfff7456036a.zip FreeBSD-src-21f42e535fa6a4e118a72f5e8130dfff7456036a.tar.gz |
sync with KAME in the following points:
- fixed typos
- improved some comment descriptions
- use NULL, instead of 0, to denote a NULL pointer
- avoid embedding a magic number in the code
- use nd6log() instead of log() to record NDP-specific logs
- nuked an unnecessay white space
Obtained from: KAME
MFC after: 1 day
Diffstat (limited to 'sys/netinet6/in6_ifattach.c')
-rw-r--r-- | sys/netinet6/in6_ifattach.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index f401896..d9244dc 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -186,8 +186,8 @@ generate_tmp_ifid(seed0, seed1, ret) * use a random non-zero value as the last resort. */ if (bcmp(nullbuf, ret, sizeof(nullbuf)) == 0) { - log(LOG_INFO, - "generate_tmp_ifid: computed MD5 value is zero.\n"); + nd6log((LOG_INFO, + "generate_tmp_ifid: computed MD5 value is zero.\n")); val32 = arc4random(); val32 = 1 + (val32 % (0xffffffff - 1)); @@ -467,7 +467,7 @@ in6_ifattach_linklocal(ifp, altifp) /* * Now call in6_update_ifa() to do a bunch of procedures to configure - * a link-local address. We can set NULL to the 3rd argument, because + * a link-local address. We can set the 3rd argument to NULL, because * we know there's no other link-local address on the interface * and therefore we are adding one (instead of updating one). */ @@ -479,10 +479,10 @@ in6_ifattach_linklocal(ifp, altifp) * suppress it. (jinmei@kame.net 20010130) */ if (error != EAFNOSUPPORT) - log(LOG_NOTICE, "in6_ifattach_linklocal: failed to " + nd6log((LOG_NOTICE, "in6_ifattach_linklocal: failed to " "configure a link-local address on %s " "(errno=%d)\n", - if_name(ifp), error); + if_name(ifp), error)); return (-1); } @@ -590,9 +590,9 @@ in6_ifattach_loopback(ifp) * NULL to the 3rd arg. */ if ((error = in6_update_ifa(ifp, &ifra, NULL)) != 0) { - log(LOG_ERR, "in6_ifattach_loopback: failed to configure " + nd6log((LOG_ERR, "in6_ifattach_loopback: failed to configure " "the loopback address on %s (errno=%d)\n", - if_name(ifp), error); + if_name(ifp), error)); return (-1); } @@ -643,7 +643,7 @@ in6_nigroup(ifp, name, namelen, in6) MD5Final(digest, &ctxt); bzero(in6, sizeof(*in6)); - in6->s6_addr16[0] = htons(0xff02); + in6->s6_addr16[0] = IPV6_ADDR_INT16_MLL; in6->s6_addr8[11] = 2; bcopy(digest, &in6->s6_addr32[3], sizeof(in6->s6_addr32[3])); if (in6_setscope(in6, ifp, NULL)) @@ -695,9 +695,9 @@ in6_ifattach(ifp, altifp) * usually, we require multicast capability to the interface */ if ((ifp->if_flags & IFF_MULTICAST) == 0) { - log(LOG_INFO, "in6_ifattach: " + nd6log((LOG_INFO, "in6_ifattach: " "%s is not multicast capable, IPv6 not enabled\n", - if_name(ifp)); + if_name(ifp))); return; } |