Module Name: src
Committed By: christos
Date: Wed Apr 6 18:08:16 UTC 2016
Modified Files:
src/lib/libutil: sockaddr_snprintf.c
Log Message:
pretty-print link addresses.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/lib/libutil/sockaddr_snprintf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libutil/sockaddr_snprintf.c
diff -u src/lib/libutil/sockaddr_snprintf.c:1.11 src/lib/libutil/sockaddr_snprintf.c:1.12
--- src/lib/libutil/sockaddr_snprintf.c:1.11 Tue Dec 31 07:58:02 2013
+++ src/lib/libutil/sockaddr_snprintf.c Wed Apr 6 14:08:16 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sockaddr_snprintf.c,v 1.11 2013/12/31 12:58:02 mlelstv Exp $ */
+/* $NetBSD: sockaddr_snprintf.c,v 1.12 2016/04/06 18:08:16 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sockaddr_snprintf.c,v 1.11 2013/12/31 12:58:02 mlelstv Exp $");
+__RCSID("$NetBSD: sockaddr_snprintf.c,v 1.12 2016/04/06 18:08:16 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -159,10 +159,17 @@ sockaddr_snprintf(char * const sbuf, con
break;
case AF_LINK:
sdl = ((const struct sockaddr_dl *)(const void *)sa);
- (void)strlcpy(addr = abuf, link_ntoa(sdl), sizeof(abuf));
- if ((w = strchr(addr, ':')) != 0) {
- *w++ = '\0';
- addr = w;
+ addr = abuf;
+ if (sdl->sdl_slen == 0 && sdl->sdl_nlen == 0
+ && sdl->sdl_alen == 0) {
+ (void)snprintf(abuf, sizeof(abuf), "link#%hu",
+ sdl->sdl_index);
+ } else {
+ (void)strlcpy(abuf, link_ntoa(sdl), sizeof(abuf));
+ if ((w = strchr(addr, ':')) != 0) {
+ *w++ = '\0';
+ addr = w;
+ }
}
break;
default:
