From owner-p4-projects@FreeBSD.ORG  Fri Dec  3 23:24:36 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 62BA716A4CE; Fri,  3 Dec 2004 23:24:36 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C908616A4EB
	for <perforce@freebsd.org>; Fri,  3 Dec 2004 23:24:35 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B5FBE43D45
	for <perforce@freebsd.org>; Fri,  3 Dec 2004 23:24:35 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB3NOZT5004693
	for <perforce@freebsd.org>; Fri, 3 Dec 2004 23:24:35 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB3NOZld004689
	for perforce@freebsd.org; Fri, 3 Dec 2004 23:24:35 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 3 Dec 2004 23:24:35 GMT
Message-Id: <200412032324.iB3NOZld004689@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 66373 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Dec 2004 23:24:37 -0000

http://perforce.freebsd.org/chv.cgi?CH=66373

Change 66373 by sam@sam_ebb on 2004/12/03 23:24:19

	o identify parameters to socket when a call fails
	o check for AF_UNSPEC when defaulting the address family

Affected files ...

.. //depot/projects/wifi/sbin/ifconfig/ifconfig.c#5 edit

Differences ...

==== //depot/projects/wifi/sbin/ifconfig/ifconfig.c#5 (text+ko) ====

@@ -461,11 +461,13 @@
 
 	if (afp == NULL)
 		afp = af_getbyname("inet");
-	ifr.ifr_addr.sa_family = afp->af_af == AF_LINK ? AF_INET : afp->af_af;
+	ifr.ifr_addr.sa_family =
+		afp->af_af == AF_LINK || afp->af_af == AF_UNSPEC ?
+		AF_INET : afp->af_af;
 	strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name);
 
 	if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0)
-		err(1, "socket");
+		err(1, "socket(family %u,SOCK_DGRAM", ifr.ifr_addr.sa_family);
 
 	while (argc > 0) {
 		const struct cmd *p;
@@ -805,7 +807,7 @@
 
 	s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0);
 	if (s < 0)
-		err(1, "socket");
+		err(1, "socket(family %u,SOCK_DGRAM)", ifr.ifr_addr.sa_family);
 
 	printf("%s: ", name);
 	printb("flags", flags, IFFBITS);