From owner-svn-src-stable@FreeBSD.ORG  Mon Jul  2 17:48:20 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2A2F61065672;
	Mon,  2 Jul 2012 17:48:20 +0000 (UTC)
	(envelope-from brueffer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 165DB8FC0C;
	Mon,  2 Jul 2012 17:48:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q62HmJnQ084991;
	Mon, 2 Jul 2012 17:48:19 GMT (envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q62HmJ6O084988;
	Mon, 2 Jul 2012 17:48:19 GMT (envelope-from brueffer@svn.freebsd.org)
Message-Id: <201207021748.q62HmJ6O084988@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Mon, 2 Jul 2012 17:48:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238007 - stable/7/usr.sbin/ndp
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jul 2012 17:48:20 -0000

Author: brueffer
Date: Mon Jul  2 17:48:19 2012
New Revision: 238007
URL: http://svn.freebsd.org/changeset/base/238007

Log:
  MFC: r217140
  
  Use ether_ntoa instead of home-grown version.
  
  PR:		169075
  Submitted by:	Alexandr <alter@alter.org.ua>

Modified:
  stable/7/usr.sbin/ndp/ndp.c
Directory Properties:
  stable/7/usr.sbin/ndp/   (props changed)

Modified: stable/7/usr.sbin/ndp/ndp.c
==============================================================================
--- stable/7/usr.sbin/ndp/ndp.c	Mon Jul  2 17:37:40 2012	(r238006)
+++ stable/7/usr.sbin/ndp/ndp.c	Mon Jul  2 17:48:19 2012	(r238007)
@@ -148,7 +148,6 @@ static void getdefif __P((void));
 static void setdefif __P((char *));
 #endif
 static char *sec2str __P((time_t));
-static char *ether_str __P((struct sockaddr_dl *));
 static void ts_print __P((const struct timeval *));
 
 #ifdef ICMPV6CTL_ND6_DRLIST
@@ -806,17 +805,14 @@ getnbrinfo(addr, ifindex, warning)
 }
 
 static char *
-ether_str(sdl)
-	struct sockaddr_dl *sdl;
+ether_str(struct sockaddr_dl *sdl)
 {
 	static char hbuf[NI_MAXHOST];
-	u_char *cp;
 
-	if (sdl->sdl_alen) {
-		cp = (u_char *)LLADDR(sdl);
-		snprintf(hbuf, sizeof(hbuf), "%x:%x:%x:%x:%x:%x",
-		    cp[0], cp[1], cp[2], cp[3], cp[4], cp[5]);
-	} else
+	if (sdl->sdl_alen > 0)
+		strlcpy(hbuf, ether_ntoa((struct ether_addr *)LLADDR(sdl)),
+		    sizeof(hbuf));
+	else
 		snprintf(hbuf, sizeof(hbuf), "(incomplete)");
 
 	return(hbuf);