[Midnightbsd-cvs] src [10322] trunk/usr.sbin/traceroute: add udp

[laffer1 at midnightbsd.org]

Revision: 10322
          http://svnweb.midnightbsd.org/src/?rev=10322
Author:   laffer1
Date:     2018-06-03 15:14:15 -0400 (Sun, 03 Jun 2018)
Log Message:
-----------
add udp

Modified Paths:
--------------
    trunk/usr.sbin/traceroute/Makefile

Added Paths:
-----------
    trunk/usr.sbin/traceroute/findsaddr-udp.c

Modified: trunk/usr.sbin/traceroute/Makefile
===================================================================
--- trunk/usr.sbin/traceroute/Makefile	2018-06-03 19:13:18 UTC (rev 10321)
+++ trunk/usr.sbin/traceroute/Makefile	2018-06-03 19:14:15 UTC (rev 10322)
@@ -1,5 +1,5 @@
-# $MidnightBSD: src/usr.sbin/traceroute/Makefile,v 1.3 2011/10/01 04:58:18 laffer1 Exp $
-# $FreeBSD: src/usr.sbin/traceroute/Makefile,v 1.22.2.2 2010/01/17 15:21:24 bz Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/traceroute/Makefile 216184 2010-12-04 14:19:27Z uqs $
 
 TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute
 .PATH: ${TRACEROUTE_DISTDIR}
@@ -6,13 +6,11 @@
 
 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
 
-WARNS?=	0
-
 CFLAGS+= -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SOCKIO_H=1 \
 	 -DHAVE_NET_ROUTE_H=1 -DHAVE_NET_IF_DL_H=1 \
 	 -DHAVE_STRERROR=1 -DHAVE_USLEEP=1 \
@@ -32,8 +30,10 @@
 LDADD=	-lipsec
 .endif
 
-CFLAGS+= -I${TRACEROUTE_DISTDIR}/lbl -I${TRACEROUTE_DISTDIR}
+CFLAGS+= -I${TRACEROUTE_DISTDIR}
 
+WARNS?=	3
+
 version.c: ${TRACEROUTE_DISTDIR}/VERSION
 	@rm -f ${.TARGET}
 	head -1 ${TRACEROUTE_DISTDIR}/VERSION | \

Added: trunk/usr.sbin/traceroute/findsaddr-udp.c
===================================================================
--- trunk/usr.sbin/traceroute/findsaddr-udp.c	                        (rev 0)
+++ trunk/usr.sbin/traceroute/findsaddr-udp.c	2018-06-03 19:14:15 UTC (rev 10322)
@@ -0,0 +1,95 @@
+/* $MidnightBSD$ */
+/*-
+ * Copyright (c) 2010 Bjoern A. Zeeb <bz at FreeBSD.org>
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: stable/10/usr.sbin/traceroute/findsaddr-udp.c 201897 2010-01-09 15:37:24Z bz $
+ */
+
+#include <string.h>
+#include <unistd.h>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+
+#include "findsaddr.h"
+#include "traceroute.h"
+
+/*
+ * Return the source address for the given destination address.
+ *
+ * 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).
+ * This has multiple advantages: no need to do PF_ROUTE operations possibly
+ * needing special privileges, jails properly taken into account and most
+ * important - getting the result the kernel would give us rather than
+ * best-guessing ourselves.
+ */
+const char *
+findsaddr(register const struct sockaddr_in *to,
+    register struct sockaddr_in *from)
+{
+	const char *errstr;
+	struct sockaddr_in cto, cfrom;
+	int s;
+	socklen_t len;
+
+	s = socket(AF_INET, SOCK_DGRAM, 0);
+	if (s == -1)
+		return ("failed to open DGRAM socket for src addr selection.");
+
+	errstr = NULL;
+	len = sizeof(struct sockaddr_in);
+	memcpy(&cto, to, len);
+	cto.sin_port = htons(65535);	/* Dummy port for connect(2). */
+	if (connect(s, (struct sockaddr *)&cto, len) == -1) {
+		errstr = "failed to connect to peer for src addr selection.";
+		goto err;
+	}
+
+	if (getsockname(s, (struct sockaddr *)&cfrom, &len) == -1) {
+		errstr = "failed to get socket name for src addr selection.";
+		goto err;
+	}
+
+	if (len != sizeof(struct sockaddr_in) || cfrom.sin_family != AF_INET) {
+		errstr = "unexpected address family in src addr selection.";
+		goto err;
+	}
+
+	/* Update source address for traceroute. */
+	setsin(from, cfrom.sin_addr.s_addr);
+
+err:
+	(void) close(s);
+
+	/* No error (string) to return. */
+	return (errstr);
+}
+
+/* end */


Property changes on: trunk/usr.sbin/traceroute/findsaddr-udp.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property