Module Name: src Committed By: tls Date: Sun Aug 10 06:59:59 UTC 2014
Modified Files: src/usr.sbin/ndp [tls-earlyentropy]: ndp.8 ndp.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.26.2.1 src/usr.sbin/ndp/ndp.8 cvs rdiff -u -r1.42 -r1.42.2.1 src/usr.sbin/ndp/ndp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.sbin/ndp/ndp.8 diff -u src/usr.sbin/ndp/ndp.8:1.26 src/usr.sbin/ndp/ndp.8:1.26.2.1 --- src/usr.sbin/ndp/ndp.8:1.26 Thu Mar 20 13:34:35 2014 +++ src/usr.sbin/ndp/ndp.8 Sun Aug 10 06:59:59 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: ndp.8,v 1.26 2014/03/20 13:34:35 roy Exp $ +.\" $NetBSD: ndp.8,v 1.26.2.1 2014/08/10 06:59:59 tls Exp $ .\" $KAME: ndp.8,v 1.33 2005/10/19 14:57:42 suz Exp $ .\" .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 20, 2014 +.Dd June 5, 2014 .Dt NDP 8 .Os .\" @@ -189,6 +189,12 @@ variable is non-0, or the flag .Ic override_rtadv is on. This flag is set to 1 by default. +.It Ic auto_linklocal +Specify whether or not to perform automatic link-local address configuration on +.Ar interface . +This flag is set by +.Li net.inet6.ip6.auto_linklocal +sysctl variable. .It Ic override_rtadv Specify whether or not to override the .Li net.inet6.ip6.accept_rtadv Index: src/usr.sbin/ndp/ndp.c diff -u src/usr.sbin/ndp/ndp.c:1.42 src/usr.sbin/ndp/ndp.c:1.42.2.1 --- src/usr.sbin/ndp/ndp.c:1.42 Tue Dec 17 20:26:46 2013 +++ src/usr.sbin/ndp/ndp.c Sun Aug 10 06:59:59 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ndp.c,v 1.42 2013/12/17 20:26:46 martin Exp $ */ +/* $NetBSD: ndp.c,v 1.42.2.1 2014/08/10 06:59:59 tls Exp $ */ /* $KAME: ndp.c,v 1.121 2005/07/13 11:30:13 keiichi Exp $ */ /* @@ -918,6 +918,9 @@ ifinfo(char *ifname, int argc, char **ar #ifdef ND6_IFF_OVERRIDE_RTADV SETFLAG("override_rtadv", ND6_IFF_OVERRIDE_RTADV); #endif +#ifdef ND6_IFF_AUTO_LINKLOCAL + SETFLAG("auto_linklocal", ND6_IFF_AUTO_LINKLOCAL); +#endif #ifdef ND6_IFF_PREFER_SOURCE SETFLAG("prefer_source", ND6_IFF_PREFER_SOURCE); #endif @@ -996,6 +999,10 @@ ifinfo(char *ifname, int argc, char **ar if ((ND.flags & ND6_IFF_OVERRIDE_RTADV)) (void)printf("override_rtadv "); #endif +#ifdef ND6_IFF_AUTO_LINKLOCAL + if ((ND.flags & ND6_IFF_AUTO_LINKLOCAL)) + (void)printf("auto_linklocal "); +#endif #ifdef ND6_IFF_PREFER_SOURCE if ((ND.flags & ND6_IFF_PREFER_SOURCE)) (void)printf("prefer_source ");