svn commit: r202486 - stable/7/usr.sbin/traceroute

[Bjoern A. Zeeb]

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).