Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 Dec 2009 06:05:36 +0000 (UTC)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r200204 - stable/8/sbin/ifconfig
Message-ID:  <200912070605.nB765ahB043372@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hrs
Date: Mon Dec  7 06:05:36 2009
New Revision: 200204
URL: http://svn.freebsd.org/changeset/base/200204

Log:
  MFC:
  
  r197138:
  - The ifconfig(8) command now supports NDP flags which are handled by ndp(8).
  
  r198006:
  - Use printb() to display the "nd6 options=" line.

Added:
  stable/8/sbin/ifconfig/af_nd6.c
     - copied, changed from r197138, head/sbin/ifconfig/af_nd6.c
Modified:
  stable/8/sbin/ifconfig/Makefile
  stable/8/sbin/ifconfig/af_inet6.c
  stable/8/sbin/ifconfig/ifconfig.8
Directory Properties:
  stable/8/sbin/ifconfig/   (props changed)

Modified: stable/8/sbin/ifconfig/Makefile
==============================================================================
--- stable/8/sbin/ifconfig/Makefile	Mon Dec  7 05:57:28 2009	(r200203)
+++ stable/8/sbin/ifconfig/Makefile	Mon Dec  7 06:05:36 2009	(r200204)
@@ -18,6 +18,7 @@ SRCS+=	af_link.c		# LLC support
 SRCS+=	af_inet.c		# IPv4 support
 SRCS+=	af_inet6.c		# IPv6 support
 SRCS+=	af_atalk.c		# AppleTalk support
+SRCS+=	af_nd6.c		# ND6 support
 
 SRCS+=	ifclone.c		# clone device support
 SRCS+=	ifmac.c			# MAC support

Modified: stable/8/sbin/ifconfig/af_inet6.c
==============================================================================
--- stable/8/sbin/ifconfig/af_inet6.c	Mon Dec  7 05:57:28 2009	(r200203)
+++ stable/8/sbin/ifconfig/af_inet6.c	Mon Dec  7 06:05:36 2009	(r200204)
@@ -67,6 +67,9 @@ static	int prefix(void *, int);
 static	char *sec2str(time_t);
 static	int explicit_prefix = 0;
 
+extern void setnd6flags(const char *, int, int, const struct afswtch *);
+extern void setnd6defif(const char *, int, int, const struct afswtch *);
+
 static	char addr_buf[MAXHOSTNAMELEN *2 + 1];	/*for getnameinfo()*/
 
 static void
@@ -493,6 +496,16 @@ static struct cmd inet6_cmds[] = {
 	DEF_CMD("-deprecated", -IN6_IFF_DEPRECATED,	setip6flags),
 	DEF_CMD("autoconf",	IN6_IFF_AUTOCONF,	setip6flags),
 	DEF_CMD("-autoconf",	-IN6_IFF_AUTOCONF,	setip6flags),
+	DEF_CMD("accept_rtadv",	ND6_IFF_ACCEPT_RTADV,	setnd6flags),
+	DEF_CMD("-accept_rtadv",-ND6_IFF_ACCEPT_RTADV,	setnd6flags),
+	DEF_CMD("defaultif",	1,			setnd6defif),
+	DEF_CMD("-defaultif",	-1,			setnd6defif),
+	DEF_CMD("ifdisabled",	ND6_IFF_IFDISABLED,	setnd6flags),
+	DEF_CMD("-ifdisabled",	-ND6_IFF_IFDISABLED,	setnd6flags),
+	DEF_CMD("nud",		ND6_IFF_PERFORMNUD,	setnd6flags),
+	DEF_CMD("-nud",		-ND6_IFF_PERFORMNUD,	setnd6flags),
+	DEF_CMD("prefer_source",ND6_IFF_PREFER_SOURCE,	setnd6flags),
+	DEF_CMD("-prefer_source",-ND6_IFF_PREFER_SOURCE,setnd6flags),
 	DEF_CMD_ARG("pltime",        			setip6pltime),
 	DEF_CMD_ARG("vltime",        			setip6vltime),
 	DEF_CMD("eui64",	0,			setip6eui64),

Copied and modified: stable/8/sbin/ifconfig/af_nd6.c (from r197138, head/sbin/ifconfig/af_nd6.c)
==============================================================================
--- head/sbin/ifconfig/af_nd6.c	Sat Sep 12 22:08:20 2009	(r197138, copy source)
+++ stable/8/sbin/ifconfig/af_nd6.c	Mon Dec  7 06:05:36 2009	(r200204)
@@ -56,17 +56,9 @@ static const char rcsid[] =
 #include "ifconfig.h"
 
 #define	MAX_SYSCTL_TRY	5
-
-static struct nd6_opt_list {
-	const char *label;
-	u_int mask;
-} nd6_opts[]  = {
-	{ "IFDISABLED",		ND6_IFF_IFDISABLED, },
-	{ "PERFORMNUD",		ND6_IFF_PERFORMNUD, },
-	{ "ACCEPT_RTADV",	ND6_IFF_ACCEPT_RTADV,	},
-	{ "PREFER_SOURCE",	ND6_IFF_PREFER_SOURCE,	},
-	{ "AUTO_LINKLOCAL",	ND6_IFF_AUTO_LINKLOCAL,	},
-};
+#define	ND6BITS	"\020\001PERFORMNUD\002ACCEPT_RTADV\003PREFER_SOURCE" \
+		"\004IFDISABLED\005DONT_SET_IFROUTE\006AUTO_LINKLOCAL" \
+		"\020DEFAULTIF"
 
 static int isnd6defif(int);
 void setnd6flags(const char *, int, int, const struct afswtch *);
@@ -153,9 +145,8 @@ nd6_status(int s)
 	char *buf, *next;
 	int mib[6], ntry;
 	int s6;
-	int i, error;
+	int error;
 	int isinet6, isdefif;
-	int nopts;
 
 	/* Check if the interface has at least one IPv6 address. */
 	mib[0] = CTL_NET;
@@ -220,22 +211,9 @@ nd6_status(int s)
 	close(s6);
 	if (nd.ndi.flags == 0 && !isdefif)
 		return;
-
-	nopts = 0;
-	printf("\tnd6 options=%d<", nd.ndi.flags);
-	for (i=0; i < sizeof(nd6_opts)/sizeof(nd6_opts[0]); i++) {
-		if (nd.ndi.flags & nd6_opts[i].mask) {
-			if (nopts++)
-				printf(",");
-			printf("%s", nd6_opts[i].label);
-		}
-	}
-	if (isdefif) {
-		if (nopts)
-			printf(",");
-		printf("DEFAULTIF");
-	}
-	printf(">\n");
+	printb("\tnd6 options",
+	    (unsigned int)(nd.ndi.flags | (isdefif << 15)), ND6BITS);
+	putchar('\n');
 }
 
 static struct afswtch af_nd6 = {

Modified: stable/8/sbin/ifconfig/ifconfig.8
==============================================================================
--- stable/8/sbin/ifconfig/ifconfig.8	Mon Dec  7 05:57:28 2009	(r200203)
+++ stable/8/sbin/ifconfig/ifconfig.8	Mon Dec  7 06:05:36 2009	(r200204)
@@ -28,7 +28,7 @@
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
 .\" $FreeBSD$
 .\"
-.Dd July 8, 2009
+.Dd December 7, 2009
 .Dt IFCONFIG 8
 .Os
 .Sh NAME
@@ -598,6 +598,38 @@ If the interface was reset when previous
 the hardware will be re-initialized.
 .El
 .Pp
+The following parameters are for ICMPv6 Neightbor Discovery Protocol:
+.Bl -tag -width indent
+.It Cm accept_rtadv
+Set a flag to enable accepting ICMPv6 Router Advertisement messages.
+.It Cm -accept_rtadv
+Clear a flag
+.Cm accept_rtadv .
+.It Cm defaultif
+Set the specified interface as the default route when there is no
+default router.
+.It Cm -defaultif
+Clear a flag
+.Cm defaultif .
+.It Cm ifdisabled
+Set a flag to disable all of IPv6 network communications on the
+specified interface.
+.It Cm -ifdisabled
+Clear a flag
+.Cm ifdisabled .
+.It Cm nud
+Set a flag to enable Neighbor Unreachability Detection.
+.It Cm -nud
+Clear a flag
+.Cm nud .
+.It Cm prefer_source
+Set a flag to prefer addesses on the interface as candidates of the
+source address for outgoing packets.
+.It Cm -prefer_source
+Clear a flag
+.Cm prefer_source .
+.El
+.Pp
 The following parameters are specific to cloning
 IEEE 802.11 wireless interfaces with the
 .Cm create



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912070605.nB765ahB043372>