commit b6adc257720ff24f593efcc07d898b05fb7db093
author Elliott Hughes <enh@google.com> Tue Jan 06 02:05:14 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 06 02:05:14 2015 +0000
tree 7c0605550e9f603f28552f061d611827140e7e8d
parent ce493fb57605d9e8d6c3710432c2f517a15b9bbc
parent f27263d6d896d89958769ffd1139b4ca6748b865

Merge "sock: fix decoding of SIOCSIFNAME"

sock.c

diff --git a/sock.c b/sock.c
index d04e833..7f653dc 100644
--- a/sock.c
+++ b/sock.c
@@ -128,15 +128,23 @@
 		if (umove(tcp, tcp->u_arg[2], &ifr) < 0)
 			tprintf(", %#lx", tcp->u_arg[2]);
 		else if (syserror(tcp)) {
-			if (code == SIOCGIFNAME || code == SIOCSIFNAME)
-				tprintf(", {ifr_index=%d, ifr_name=???}", ifr.ifr_ifindex);
-			else
-				tprintf(", {ifr_name=\"%.*s\", ???}",
+			if (code == SIOCGIFNAME) {
+				tprintf(", {ifr_index=%d, ifr_name=???}",
+					ifr.ifr_ifindex);
+			} else {
+				tprintf(", {ifr_name=\"%.*s\", ",
 					IFNAMSIZ, ifr.ifr_name);
-		} else if (code == SIOCGIFNAME || code == SIOCSIFNAME)
+
+				if (code == SIOCSIFNAME)
+					tprintf("ifr_newname=\"%.*s\"}",
+						IFNAMSIZ, ifr.ifr_newname);
+				else
+					tprintf("???}");
+			}
+		} else if (code == SIOCGIFNAME) {
 			tprintf(", {ifr_index=%d, ifr_name=\"%.*s\"}",
 				ifr.ifr_ifindex, IFNAMSIZ, ifr.ifr_name);
-		else {
+		} else {
 			tprintf(", {ifr_name=\"%.*s\", ",
 				IFNAMSIZ, ifr.ifr_name);
 			switch (code) {
@@ -191,6 +199,10 @@
 			case SIOCSIFMTU:
 				tprintf("ifr_mtu=%d", ifr.ifr_mtu);
 				break;
+			case SIOCSIFNAME:
+				tprintf("ifr_newname=\"%.*s\"",
+					IFNAMSIZ, ifr.ifr_newname);
+				break;
 			case SIOCGIFSLAVE:
 			case SIOCSIFSLAVE:
 				tprintf("ifr_slave=\"%s\"", ifr.ifr_slave);
@@ -240,7 +252,7 @@
 				if (i > 0)
 					tprints(", ");
 				tprintf("{\"%.*s\", {",
-					IFNAMSIZ, ifra[i].ifr_name);
+					IFNAMSIZ, ifra[i].ifr_newname);
 				if (verbose(tcp)) {
 					printxval(addrfams,
 						  ifra[i].ifr_addr.sa_family,