From owner-svn-src-projects@FreeBSD.ORG  Wed Feb  9 23:59:18 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4F8E8106564A;
	Wed,  9 Feb 2011 23:59:18 +0000 (UTC)
	(envelope-from jeff@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 151A28FC1F;
	Wed,  9 Feb 2011 23:59:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p19NxHZG002087;
	Wed, 9 Feb 2011 23:59:17 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p19NxHBT002085;
	Wed, 9 Feb 2011 23:59:17 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201102092359.p19NxHBT002085@svn.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Wed, 9 Feb 2011 23:59:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218498 - projects/ofed/head/usr.sbin/ndp
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Feb 2011 23:59:18 -0000

Author: jeff
Date: Wed Feb  9 23:59:17 2011
New Revision: 218498
URL: http://svn.freebsd.org/changeset/base/218498

Log:
   - Use link_ntoa() for non ethernet addresses.
  
  Suggested by:	jhb

Modified:
  projects/ofed/head/usr.sbin/ndp/ndp.c

Modified: projects/ofed/head/usr.sbin/ndp/ndp.c
==============================================================================
--- projects/ofed/head/usr.sbin/ndp/ndp.c	Wed Feb  9 20:23:22 2011	(r218497)
+++ projects/ofed/head/usr.sbin/ndp/ndp.c	Wed Feb  9 23:59:17 2011	(r218498)
@@ -830,14 +830,9 @@ ether_str(sdl)
 		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 == 20) {
-		cp = (u_char *)LLADDR(sdl);
-		snprintf(hbuf, sizeof(hbuf),
-		   "%x:%x:%x:%x:%x%x:%x:%x:%x:%x%x:%x:%x:%x:%x%x:%x:%x:%x:%x",
-		    cp[0], cp[1], cp[2], cp[3], cp[4], cp[5], cp[6], cp[7],
-		    cp[8], cp[9], cp[10], cp[11], cp[12], cp[13], cp[14],
-		    cp[15], cp[16], cp[17], cp[18], cp[19]);
-
+	} else if (sdl->sdl_alen) {
+		int n = sdl->sdl_nlen > 0 ? sdl->sdl_nlen + 1 : 0;
+		snprintf(hbuf, sizeof(hbuf), "%s", link_ntoa(sdl) + n);
 	} else
 		snprintf(hbuf, sizeof(hbuf), "(incomplete)");