 @@ -1,14 +1,14 @@
-/*	$NetBSD: route.c,v 1.141 2013/10/18 21:01:00 christos Exp $	*/
+/*	$NetBSD: route.c,v 1.142 2013/10/19 00:39:39 christos Exp $	*/
 /*
  * Copyright (c) 1983, 1989, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1991, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)route.c	8.6 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: route.c,v 1.141 2013/10/18 21:01:00 christos Exp $");
+__RCSID("$NetBSD: route.c,v 1.142 2013/10/19 00:39:39 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/mbuf.h>
 #include <sys/sysctl.h>
 #include <net/if.h>
 #include <net/route.h>
 #include <net/if_dl.h>
 @@ -528,39 +528,27 @@ routename(const struct sockaddr *sa, str
 	case AF_INET6:
+	    {
 		struct sockaddr_in6 sin6;
 		int niflags;
 		char nihost[NI_MAXHOST];
 		niflags = 0;
 		if (nflag)
 			niflags |= NI_NUMERICHOST;
 		memset(&sin6, 0, sizeof(sin6));
 		memcpy(&sin6, sa, sa->sa_len);
 		sin6.sin6_len = sizeof(struct sockaddr_in6);
 		sin6.sin6_family = AF_INET6;
-#ifdef __KAME__
+		inet6_getscopeid(&sin6, 3);
 		if (sa->sa_len == sizeof(struct sockaddr_in6) &&
 		    (IN6_IS_ADDR_LINKLOCAL(&sin6.sin6_addr) ||
 		     IN6_IS_ADDR_MC_LINKLOCAL(&sin6.sin6_addr)) &&
 		    sin6.sin6_scope_id == 0) {
 			uint16_t scope;
 			memcpy(&scope, &sin6.sin6_addr.s6_addr[2],
 			    sizeof(scope));
 			sin6.sin6_scope_id = ntohs(scope);
 			sin6.sin6_addr.s6_addr[2] = 0;
 			sin6.sin6_addr.s6_addr[3] = 0;
 #endif
 		nml = netmask_length(nm, AF_INET6);
 		if (IN6_IS_ADDR_UNSPECIFIED(&sin6.sin6_addr)) {
 			if (nml == 0)
 				strlcpy(line, "::", sizeof(line));
 			else
 				/* noncontiguous never happens in ipv6 */
 				snprintf(line, sizeof(line), "::/%d", nml);
+		}
 		else if (getnameinfo((struct sockaddr *)&sin6, sin6.sin6_len,
 		    nihost, sizeof(nihost), NULL, 0, niflags) != 0)
 			strlcpy(line, "invalid", sizeof(line));
 		else {
 			char *ccp;
 @@ -697,39 +685,27 @@ netname(const struct sockaddr *sa, struc
 #ifdef INET6
 	case AF_INET6:
+	    {
 		struct sockaddr_in6 sin6;
 		int niflags;
 		niflags = 0;
 		if (nflag)
 			niflags |= NI_NUMERICHOST;
 		memset(&sin6, 0, sizeof(sin6));
 		memcpy(&sin6, sa, sa->sa_len);
 		sin6.sin6_len = sizeof(struct sockaddr_in6);
 		sin6.sin6_family = AF_INET6;
-#ifdef __KAME__
+		inet6_putscopeid(&sin6, 3);
 		if (sa->sa_len == sizeof(struct sockaddr_in6) &&
 		    (IN6_IS_ADDR_LINKLOCAL(&sin6.sin6_addr) ||
 		     IN6_IS_ADDR_MC_LINKLOCAL(&sin6.sin6_addr)) &&
 		    sin6.sin6_scope_id == 0) {
 			uint16_t scope;
 			memcpy(&scope, &sin6.sin6_addr.s6_addr[2],
 			    sizeof(scope));
 			sin6.sin6_scope_id = ntohs(scope);
 			sin6.sin6_addr.s6_addr[2] = 0;
 			sin6.sin6_addr.s6_addr[3] = 0;
 #endif
 		nml = netmask_length(nm, AF_INET6);
 		if (IN6_IS_ADDR_UNSPECIFIED(&sin6.sin6_addr)) {
 			if (nml == 0)
 				strlcpy(line, "::", sizeof(line));
 			else
 				/* noncontiguous never happens in ipv6 */
 				snprintf(line, sizeof(line), "::/%d", nml);
+		}
 		else if (getnameinfo((struct sockaddr *)&sin6, sin6.sin6_len,
 		    line, sizeof(line), NULL, 0, niflags) != 0)
 			strlcpy(line, "invalid", sizeof(line));
 		break;
+	    }
 @@ -1249,37 +1225,27 @@ getaddr(int which, const char *s, struct
 			if (getaddrinfo(s, "0", &hints, &res) != 0)
 				errx(EXIT_FAILURE, "%s: bad value", s);
+		}
 		if (slash)
 			*slash = '/';
 		if (sizeof(su->sin6) != res->ai_addrlen)
 			errx(EXIT_FAILURE, "%s: bad value", s);
 		if (res->ai_next) {
 			errx(EXIT_FAILURE,
 			    "%s: address resolved to multiple values", s);
+		}
 		memcpy(&su->sin6, res->ai_addr, sizeof(su->sin6));
 		freeaddrinfo(res);
-#ifdef __KAME__
+		inet6_getscopeid(&su->sin6, 3);
 		if ((IN6_IS_ADDR_LINKLOCAL(&su->sin6.sin6_addr) ||
 		     IN6_IS_ADDR_MC_LINKLOCAL(&su->sin6.sin6_addr)) &&
 		    su->sin6.sin6_scope_id) {
 			uint16_t scope;
 			scope = htons(su->sin6.sin6_scope_id);
 			memcpy(&su->sin6.sin6_addr.s6_addr[2], &scope,
 			    sizeof(scope));
 			su->sin6.sin6_scope_id = 0;
 #endif
 		if (hints.ai_flags == AI_NUMERICHOST) {
 			if (slash)
 				return prefixlen(slash + 1, soup);
 			if (which == RTA_DST)
 				return inet6_makenetandmask(&su->sin6, soup);
 			return 0;
 		} else
 			return 1;
+	    }
 #endif
 	case PF_ROUTE:
 		su->sa.sa_len = sizeof(*su);