From owner-svn-src-all@FreeBSD.ORG  Sun Jan 17 15:21:24 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7460E106566C;
	Sun, 17 Jan 2010 15:21:24 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 621918FC16;
	Sun, 17 Jan 2010 15:21:24 +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 o0HFLORR062623;
	Sun, 17 Jan 2010 15:21:24 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0HFLOAX062620;
	Sun, 17 Jan 2010 15:21:24 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201001171521.o0HFLOAX062620@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 17 Jan 2010 15:21:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202486 - stable/7/usr.sbin/traceroute
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Jan 2010 15:21:24 -0000

Author: bz
Date: Sun Jan 17 15:21:24 2010
New Revision: 202486
URL: http://svn.freebsd.org/changeset/base/202486

Log:
  MFC r201806:
    Switch traceroute over to make use of proper in-kernel source
    address selection.
  
    Reviewed by:  rwatson, fenner
    PR:           kern/139454
    Tested by:    Frank Steinborn (steinex nognu.de)
  
  MFC r201897:
    Correct spelling.
  
    Submitted by: (pluknet gmail.com)

Added:
  stable/7/usr.sbin/traceroute/findsaddr-udp.c
     - copied, changed from r201806, head/usr.sbin/traceroute/findsaddr-udp.c
Modified:
  stable/7/usr.sbin/traceroute/Makefile
Directory Properties:
  stable/7/usr.sbin/traceroute/   (props changed)

Modified: stable/7/usr.sbin/traceroute/Makefile
==============================================================================
--- stable/7/usr.sbin/traceroute/Makefile	Sun Jan 17 15:20:34 2010	(r202485)
+++ stable/7/usr.sbin/traceroute/Makefile	Sun Jan 17 15:21:24 2010	(r202486)
@@ -5,7 +5,7 @@ TRACEROUTE_DISTDIR?= ${.CURDIR}/../../co
 
 PROG=	traceroute
 MAN=	traceroute.8
-SRCS=	as.c version.c traceroute.c ifaddrlist.c findsaddr-socket.c
+SRCS=	as.c version.c traceroute.c ifaddrlist.c findsaddr-udp.c
 BINOWN=	root
 BINMODE=4555
 CLEANFILES=	version.c
@@ -29,7 +29,7 @@ DPADD=	${LIBIPSEC}
 LDADD=	-lipsec
 .endif
 
-CFLAGS+= -I${TRACEROUTE_DISTDIR}/lbl
+CFLAGS+= -I${TRACEROUTE_DISTDIR}/lbl -I${TRACEROUTE_DISTDIR}
 
 version.c: ${TRACEROUTE_DISTDIR}/VERSION
 	@rm -f ${.TARGET}

Copied and modified: stable/7/usr.sbin/traceroute/findsaddr-udp.c (from r201806, head/usr.sbin/traceroute/findsaddr-udp.c)
==============================================================================
--- head/usr.sbin/traceroute/findsaddr-udp.c	Fri Jan  8 16:59:28 2010	(r201806, copy source)
+++ stable/7/usr.sbin/traceroute/findsaddr-udp.c	Sun Jan 17 15:21:24 2010	(r202486)
@@ -40,7 +40,7 @@
 /*
  * Return the source address for the given destination address.
  *
- * This makes use of proper source address seclection in the FreeBSD kernel
+ * This makes use of proper source address selection in the FreeBSD kernel
  * even taking jails into account (sys/netinet/in_pcb.c:in_pcbladdr()).
  * We open a UDP socket, and connect to the destination, letting the kernel
  * do the bind and then read the source IPv4 address using getsockname(2).