Update to FreeBSD head 2017-06-01

Git mirror commit dfb26efac4ce9101dda240e94d9ab53f80a9e131.

Update #3472.

8 files changed, 82 insertions, 47 deletions

diff --git a/freebsd/sbin/ifconfig/af_inet6.c b/freebsd/sbin/ifconfig/af_inet6.c
index 2dc372a6..173d804d 100644
--- a/freebsd/sbin/ifconfig/af_inet6.c
+++ b/freebsd/sbin/ifconfig/af_inet6.c
@@ -47,7 +47,6 @@ static const char rcsid[] =
 #include <net/if.h>
 
 #include <err.h>
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -348,8 +347,7 @@ in6_getaddr(const char *cs, int which)
 	if (slen < sizeof(s) - 1 ) {
 		memcpy(s, cs, slen + 1);
 	} else {
-		error = ENAMETOOLONG;
-		goto done;
+		errx(1, "%s: address too long", cs);
 	}
 	newaddr &= 1;
 
@@ -370,13 +368,14 @@ in6_getaddr(const char *cs, int which)
 		bzero(&hints, sizeof(struct addrinfo));
 		hints.ai_family = AF_INET6;
 		error = getaddrinfo(s, NULL, &hints, &res);
+		if (error != 0) {
+			if (inet_pton(AF_INET6, s, &sin->sin6_addr) != 1)
+				errx(1, "%s: bad value", s);
+		} else {
+			bcopy(res->ai_addr, sin, res->ai_addrlen);
+			freeaddrinfo(res);
+		}
 	}
-done:
-	if (error != 0) {
-		if (inet_pton(AF_INET6, cs, &sin->sin6_addr) != 1)
-			errx(1, "%s: bad value", cs);
-	} else
-		bcopy(res->ai_addr, sin, res->ai_addrlen);
 }
 
 static int
diff --git a/freebsd/sbin/ifconfig/af_link.c b/freebsd/sbin/ifconfig/af_link.c
index 0be5d388..da828d6c 100644
--- a/freebsd/sbin/ifconfig/af_link.c
+++ b/freebsd/sbin/ifconfig/af_link.c
@@ -51,6 +51,7 @@ static const char rcsid[] =
 #include <stdlib.h>
 #include <string.h>
 #include <ifaddrs.h>
+#include <unistd.h>
 
 #include <net/if_dl.h>
 #include <net/if_types.h>
@@ -79,7 +80,7 @@ link_status(int s __unused, const struct ifaddrs *ifa)
 		    sdl->sdl_alen == ETHER_ADDR_LEN) {
 			ether_format = ether_ntoa((struct ether_addr *)LLADDR(sdl));
 			if (f_ether != NULL && strcmp(f_ether, "dash") == 0) {
-				for (format_char = strchr(ether_format, ':'); 
+				for (format_char = strchr(ether_format, ':');
 				    format_char != NULL; 
 				    format_char = strchr(ether_format, ':'))
 					*format_char = '-';
@@ -90,6 +91,48 @@ link_status(int s __unused, const struct ifaddrs *ifa)
 
 			printf("\tlladdr %s\n", link_ntoa(sdl) + n);
 		}
+		/* Best-effort (i.e. failures are silent) to get original
+		 * hardware address, as read by NIC driver at attach time. Only
+		 * applies to Ethernet NICs (IFT_ETHER). However, laggX
+		 * interfaces claim to be IFT_ETHER, and re-type their component
+		 * Ethernet NICs as IFT_IEEE8023ADLAG. So, check for both. If
+		 * the MAC is zeroed, then it's actually a lagg.
+		 */
+		if ((sdl->sdl_type == IFT_ETHER ||
+		    sdl->sdl_type == IFT_IEEE8023ADLAG) &&
+		    sdl->sdl_alen == ETHER_ADDR_LEN) {
+			struct ifreq ifr;
+			int sock_hw;
+			int rc;
+			static const u_char laggaddr[6] = {0};
+
+			strncpy(ifr.ifr_name, ifa->ifa_name,
+			    sizeof(ifr.ifr_name));
+			memcpy(&ifr.ifr_addr, ifa->ifa_addr,
+			    sizeof(ifa->ifa_addr->sa_len));
+			ifr.ifr_addr.sa_family = AF_LOCAL;
+			if ((sock_hw = socket(AF_LOCAL, SOCK_DGRAM, 0)) < 0) {
+				warn("socket(AF_LOCAL,SOCK_DGRAM)");
+				return;
+			}
+			rc = ioctl(sock_hw, SIOCGHWADDR, &ifr);
+			close(sock_hw);
+			if (rc != 0) {
+				return;
+			}
+			if (memcmp(ifr.ifr_addr.sa_data, laggaddr, sdl->sdl_alen) == 0) {
+				return;
+			}
+			ether_format = ether_ntoa((const struct ether_addr *)
+			    &ifr.ifr_addr.sa_data);
+			if (f_ether != NULL && strcmp(f_ether, "dash") == 0) {
+				for (format_char = strchr(ether_format, ':');
+				    format_char != NULL; 
+				    format_char = strchr(ether_format, ':'))
+					*format_char = '-';
+			}
+			printf("\thwaddr %s\n", ether_format);
+		}
 	}
 }
 
diff --git a/freebsd/sbin/ifconfig/af_nd6.c b/freebsd/sbin/ifconfig/af_nd6.c
index f7d221b9..a29457ae 100644
--- a/freebsd/sbin/ifconfig/af_nd6.c
+++ b/freebsd/sbin/ifconfig/af_nd6.c
@@ -69,8 +69,7 @@ static const char rcsid[] =
 #define	MAX_SYSCTL_TRY	5
 #define	ND6BITS	"\020\001PERFORMNUD\002ACCEPT_RTADV\003PREFER_SOURCE" \
 		"\004IFDISABLED\005DONT_SET_IFROUTE\006AUTO_LINKLOCAL" \
-		"\007NO_RADR\010NO_PREFER_IFACE\011IGNORELOOP\012NO_DAD" \
-		"\020DEFAULTIF"
+		"\007NO_RADR\010NO_PREFER_IFACE\011NO_DAD\020DEFAULTIF"
 
 static int isnd6defif(int);
 void setnd6flags(const char *, int, int, const struct afswtch *);
diff --git a/freebsd/sbin/ifconfig/ifclone.c b/freebsd/sbin/ifconfig/ifclone.c
index d885f62a..195d5899 100644
--- a/freebsd/sbin/ifconfig/ifclone.c
+++ b/freebsd/sbin/ifconfig/ifclone.c
@@ -99,6 +99,7 @@ list_cloners(void)
 
 	putchar('\n');
 	free(buf);
+	close(s);
 }
 
 struct clone_defcb {
diff --git a/freebsd/sbin/ifconfig/ifconfig.c b/freebsd/sbin/ifconfig/ifconfig.c
index b9ba236a..b61cea48 100644
--- a/freebsd/sbin/ifconfig/ifconfig.c
+++ b/freebsd/sbin/ifconfig/ifconfig.c
@@ -124,7 +124,7 @@ static	int ifconfig(int argc, char *const *argv, int iscreate,
 static	void status(const struct afswtch *afp, const struct sockaddr_dl *sdl,
 		struct ifaddrs *ifa);
 static	void tunnel_status(int s);
-static	void usage(void);
+static	_Noreturn void usage(void);
 
 static struct afswtch *af_getbyname(const char *name);
 static struct afswtch *af_getbyfamily(int af);
@@ -883,26 +883,24 @@ top:
 			 */
 			p = (setaddr ? &setifdstaddr_cmd : &setifaddr_cmd);
 		}
-		if (p->c_u.c_func || p->c_u.c_func2) {
-			if (p->c_parameter == NEXTARG) {
-				if (argv[1] == NULL)
-					errx(1, "'%s' requires argument",
-					    p->c_name);
-				p->c_u.c_func(argv[1], 0, s, afp);
+		if (p->c_parameter == NEXTARG && p->c_u.c_func) {
+			if (argv[1] == NULL)
+				errx(1, "'%s' requires argument",
+				    p->c_name);
+			p->c_u.c_func(argv[1], 0, s, afp);
+			argc--, argv++;
+		} else if (p->c_parameter == OPTARG && p->c_u.c_func) {
+			p->c_u.c_func(argv[1], 0, s, afp);
+			if (argv[1] != NULL)
 				argc--, argv++;
-			} else if (p->c_parameter == OPTARG) {
-				p->c_u.c_func(argv[1], 0, s, afp);
-				if (argv[1] != NULL)
-					argc--, argv++;
-			} else if (p->c_parameter == NEXTARG2) {
-				if (argc < 3)
-					errx(1, "'%s' requires 2 arguments",
-					    p->c_name);
-				p->c_u.c_func2(argv[1], argv[2], s, afp);
-				argc -= 2, argv += 2;
-			} else
-				p->c_u.c_func(*argv, p->c_parameter, s, afp);
-		}
+		} else if (p->c_parameter == NEXTARG2 && p->c_u.c_func2) {
+			if (argc < 3)
+				errx(1, "'%s' requires 2 arguments",
+				    p->c_name);
+			p->c_u.c_func2(argv[1], argv[2], s, afp);
+			argc -= 2, argv += 2;
+		} else if (p->c_u.c_func)
+			p->c_u.c_func(*argv, p->c_parameter, s, afp);
 		argc--, argv++;
 	}
 
@@ -1382,8 +1380,8 @@ printb(const char *s, unsigned v, const char *bits)
 		printf("%s=%o", s, v);
 	else
 		printf("%s=%x", s, v);
-	bits++;
 	if (bits) {
+		bits++;
 		putchar('<');
 		while ((i = *bits++) != '\0') {
 			if (v & (1 << (i-1))) {
@@ -1462,8 +1460,11 @@ ifmaybeload(const char *name)
 		}
 	}
 
-	/* not present, we should try to load it */
-	kldload(ifkind);
+	/*
+	 * Try to load the module.  But ignore failures, because ifconfig can't
+	 * infer the names of all drivers (eg mlx4en(4)).
+	 */
+	(void) kldload(ifkind);
 #endif /* __rtems__ */
 }
 
diff --git a/freebsd/sbin/ifconfig/iflagg.c b/freebsd/sbin/ifconfig/iflagg.c
index d8a897d4..d659ed57 100644
--- a/freebsd/sbin/ifconfig/iflagg.c
+++ b/freebsd/sbin/ifconfig/iflagg.c
@@ -212,24 +212,17 @@ static void
 lagg_status(int s)
 {
 	struct lagg_protos lpr[] = LAGG_PROTOS;
-	struct lagg_reqport rp, rpbuf[LAGG_MAX_PORTS];
+	struct lagg_reqport rpbuf[LAGG_MAX_PORTS];
 	struct lagg_reqall ra;
 	struct lagg_reqopts ro;
 	struct lagg_reqflags rf;
 	struct lacp_opreq *lp;
 	const char *proto = "<unknown>";
-	int i, isport = 0;
+	int i;
 
-	bzero(&rp, sizeof(rp));
 	bzero(&ra, sizeof(ra));
 	bzero(&ro, sizeof(ro));
 
-	strlcpy(rp.rp_ifname, name, sizeof(rp.rp_ifname));
-	strlcpy(rp.rp_portname, name, sizeof(rp.rp_portname));
-
-	if (ioctl(s, SIOCGLAGGPORT, &rp) == 0)
-		isport = 1;
-
 	strlcpy(ra.ra_ifname, name, sizeof(ra.ra_ifname));
 	ra.ra_size = sizeof(rpbuf);
 	ra.ra_port = rpbuf;
@@ -269,8 +262,6 @@ lagg_status(int s)
 				sep = ",";
 			}
 		}
-		if (isport)
-			printf(" laggdev %s", rp.rp_ifname);
 		putchar('\n');
 		if (verbose) {
 			printf("\tlagg options:\n");
diff --git a/freebsd/sbin/ifconfig/ifmedia.c b/freebsd/sbin/ifconfig/ifmedia.c
index 64bf544b..1b7eef46 100644
--- a/freebsd/sbin/ifconfig/ifmedia.c
+++ b/freebsd/sbin/ifconfig/ifmedia.c
@@ -413,7 +413,7 @@ setmediamode(const char *val, int d, int s, const struct afswtch *afp)
 }
 
 /**********************************************************************
- * A good chunk of this is duplicated from sys/net/ifmedia.c
+ * A good chunk of this is duplicated from sys/net/if_media.c
  **********************************************************************/
 
 static struct ifmedia_description ifm_type_descriptions[] =
diff --git a/freebsd/sbin/ifconfig/ifpfsync.c b/freebsd/sbin/ifconfig/ifpfsync.c
index 1c4afc13..e2332fbb 100644
--- a/freebsd/sbin/ifconfig/ifpfsync.c
+++ b/freebsd/sbin/ifconfig/ifpfsync.c
@@ -132,6 +132,7 @@ setpfsync_syncpeer(const char *val, int d, int s, const struct afswtch *rafp)
 
 	if (ioctl(s, SIOCSETPFSYNC, (caddr_t)&ifr) == -1)
 		err(1, "SIOCSETPFSYNC");
+	freeaddrinfo(peerres);
 }
 
 /* ARGSUSED */