From owner-p4-projects@FreeBSD.ORG  Sat Aug 15 21:26:17 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D2326106568D; Sat, 15 Aug 2009 21:26:16 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 96E17106568B
	for <perforce@FreeBSD.org>; Sat, 15 Aug 2009 21:26:16 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 865088FC45
	for <perforce@FreeBSD.org>; Sat, 15 Aug 2009 21:26:16 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7FLQG14033925
	for <perforce@FreeBSD.org>; Sat, 15 Aug 2009 21:26:16 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7FLQGlN033923
	for perforce@freebsd.org; Sat, 15 Aug 2009 21:26:16 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sat, 15 Aug 2009 21:26:16 GMT
Message-Id: <200908152126.n7FLQGlN033923@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 167381 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Aug 2009 21:26:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=167381

Change 167381 by pgj@petymeg-current on 2009/08/15 21:25:44

	Add support for IP6 family addresses.

Affected files ...

.. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_route.c#5 edit

Differences ...

==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_route.c#5 (text+ko) ====

@@ -435,6 +435,37 @@
 		break;
 #ifdef INET6
 	case PF_INET6:
+		/*
+		 * XXX: This is a special workaround for KAME kernels.
+		 * sin6_scope_id field of SA should be set in the future.
+		 */
+		if (IN6_IS_ADDR_LINKLOCAL(in6) ||
+		    IN6_IS_ADDR_MC_LINKLOCAL(in6)) {
+			sa_in6->sin6_scope_id =
+			    (u_int32_t)ntohs(*(u_short *)&in6->s6_addr[2]);
+			*(u_short *)&in6->s6_addr[2] = 0;
+		}
+		if (flags & RTF_HOST) {
+			rap->rat_address = strdup(routename6(sa_in6, 0));
+			strlcpy(rap->rat_ni_address, routename6(sa_in6, 1),
+			    sizeof(rap->rat_ni_address));
+		}
+		else if (mask != NULL) {
+			rap->rat_address = strdup(netname6(sa_in6,
+			    &mk_in6->sin6_addr, 0));
+			strlcpy(rap->rat_ni_address,
+			    netname6(sa_in6, &mk_in6->sin6_addr, 1),
+			    sizeof(rap->rat_ni_address));
+		} else {
+			rap->rat_address = strdup(netname6(sa_in6, 0L, 0));
+			strlcpy(rap->rat_ni_address, rap->rat_address,
+			    sizeof(rap->rat_ni_address));
+		}
+		rap->rat_data = malloc(sizeof(struct sockaddr_in6));
+		if (rap->rat_data != NULL) {
+			rap->rat_data_len = sizeof(struct sockaddr_in6);
+			memcpy(rap->rat_data, sa_in6, rap->rat_data_len);
+		}
 		break;
 #endif
 	case PF_IPX: