Date: Wed, 9 Feb 2011 23:59:17 +0000 (UTC) From: Jeff Roberson <jeff@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r218498 - projects/ofed/head/usr.sbin/ndp Message-ID: <201102092359.p19NxHBT002085@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102092359.p19NxHBT002085>