CVS commit: src/sbin/ifconfig

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Tue Sep 13 00:20:51 UTC 2016

Modified Files:
        src/sbin/ifconfig: af_inet.c af_inet6.c

Log Message:
print address flag bits using snprintb


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sbin/ifconfig/af_inet.c
cvs rdiff -u -r1.35 -r1.36 src/sbin/ifconfig/af_inet6.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sbin/ifconfig/af_inet.c
diff -u src/sbin/ifconfig/af_inet.c:1.19 src/sbin/ifconfig/af_inet.c:1.20
--- src/sbin/ifconfig/af_inet.c:1.19	Mon Feb 29 11:23:25 2016
+++ src/sbin/ifconfig/af_inet.c	Mon Sep 12 20:20:51 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: af_inet.c,v 1.19 2016/02/29 16:23:25 riastradh Exp $	*/
+/*	$NetBSD: af_inet.c,v 1.20 2016/09/13 00:20:51 christos Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: af_inet.c,v 1.19 2016/02/29 16:23:25 riastradh Exp $");
+__RCSID("$NetBSD: af_inet.c,v 1.20 2016/09/13 00:20:51 christos Exp $");
 #endif /* not lint */
 
 #include <sys/param.h> 
@@ -149,12 +149,10 @@ in_alias(const char *ifname, prop_dictio
 		if (errno != EADDRNOTAVAIL)
 			warn("SIOCGIFAFLAG_IN");
 	} else {
-		if (ifr.ifr_addrflags & IN_IFF_TENTATIVE)
-			printf(" tentative");
-		if (ifr.ifr_addrflags & IN_IFF_DUPLICATED)
-			printf(" duplicated");
-		if (ifr.ifr_addrflags & IN_IFF_DETACHED)
-			printf(" detached");
+		char fbuf[1024];
+		(void)snprintb(fbuf, sizeof(fbuf), IN_IFFBITS,
+		    ifr.ifr_addrflags);
+		printf(" flags %s", fbuf);
 	}
 #endif
 }

Index: src/sbin/ifconfig/af_inet6.c
diff -u src/sbin/ifconfig/af_inet6.c:1.35 src/sbin/ifconfig/af_inet6.c:1.36
--- src/sbin/ifconfig/af_inet6.c:1.35	Mon Feb 29 11:23:25 2016
+++ src/sbin/ifconfig/af_inet6.c	Mon Sep 12 20:20:51 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: af_inet6.c,v 1.35 2016/02/29 16:23:25 riastradh Exp $	*/
+/*	$NetBSD: af_inet6.c,v 1.36 2016/09/13 00:20:51 christos Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: af_inet6.c,v 1.35 2016/02/29 16:23:25 riastradh Exp $");
+__RCSID("$NetBSD: af_inet6.c,v 1.36 2016/09/13 00:20:51 christos Exp $");
 #endif /* not lint */
 
 #include <sys/param.h> 
@@ -325,20 +325,10 @@ in6_alias(const char *ifname, prop_dicti
 		if (errno != EADDRNOTAVAIL)
 			warn("SIOCGIFAFLAG_IN6");
 	} else {
-		if (ifr6.ifr_ifru.ifru_flags6 & IN6_IFF_ANYCAST)
-			printf(" anycast");
-		if (ifr6.ifr_ifru.ifru_flags6 & IN6_IFF_TENTATIVE)
-			printf(" tentative");
-		if (ifr6.ifr_ifru.ifru_flags6 & IN6_IFF_DUPLICATED)
-			printf(" duplicated");
-		if (ifr6.ifr_ifru.ifru_flags6 & IN6_IFF_DETACHED)
-			printf(" detached");
-		if (ifr6.ifr_ifru.ifru_flags6 & IN6_IFF_DEPRECATED)
-			printf(" deprecated");
-		if (ifr6.ifr_ifru.ifru_flags6 & IN6_IFF_AUTOCONF)
-			printf(" autoconf");
-		if (ifr6.ifr_ifru.ifru_flags6 & IN6_IFF_TEMPORARY)
-			printf(" temporary");
+		char fbuf[1024];
+		(void)snprintb(fbuf, sizeof(fbuf), IN6_IFFBITS,
+		    ifr6.ifr_ifru.ifru_flags6);
+		printf(" flags %s", fbuf);
 	}
 
 	if (scopeid)