Module Name: src
Committed By: maxv
Date: Mon Apr 23 10:14:12 UTC 2018
Modified Files:
src/usr.sbin/traceroute6: traceroute6.c
Log Message:
Remove dead/broken code. We want to favor RFC3542 over RFC2292. No
functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/usr.sbin/traceroute6/traceroute6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/traceroute6/traceroute6.c
diff -u src/usr.sbin/traceroute6/traceroute6.c:1.47 src/usr.sbin/traceroute6/traceroute6.c:1.48
--- src/usr.sbin/traceroute6/traceroute6.c:1.47 Mon Apr 23 09:58:35 2018
+++ src/usr.sbin/traceroute6/traceroute6.c Mon Apr 23 10:14:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: traceroute6.c,v 1.47 2018/04/23 09:58:35 maxv Exp $ */
+/* $NetBSD: traceroute6.c,v 1.48 2018/04/23 10:14:12 maxv Exp $ */
/* $KAME: traceroute6.c,v 1.67 2004/01/25 03:24:39 itojun Exp $ */
/*
@@ -75,7 +75,7 @@ static char sccsid[] = "@(#)traceroute.c
#else
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: traceroute6.c,v 1.47 2018/04/23 09:58:35 maxv Exp $");
+__RCSID("$NetBSD: traceroute6.c,v 1.48 2018/04/23 10:14:12 maxv Exp $");
#endif
#endif
@@ -384,26 +384,14 @@ main(int argc, char *argv[])
max_hops = i;
/* specify to tell receiving interface */
-#ifdef IPV6_RECVPKTINFO
if (setsockopt(rcvsock, IPPROTO_IPV6, IPV6_RECVPKTINFO, &on,
sizeof(on)) < 0)
err(1, "setsockopt(IPV6_RECVPKTINFO)");
-#else /* old adv. API */
- if (setsockopt(rcvsock, IPPROTO_IPV6, IPV6_PKTINFO, &on,
- sizeof(on)) < 0)
- err(1, "setsockopt(IPV6_PKTINFO)");
-#endif
/* specify to tell value of hoplimit field of received IP6 hdr */
-#ifdef IPV6_RECVHOPLIMIT
if (setsockopt(rcvsock, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &on,
sizeof(on)) < 0)
err(1, "setsockopt(IPV6_RECVHOPLIMIT)");
-#else /* old adv. API */
- if (setsockopt(rcvsock, IPPROTO_IPV6, IPV6_HOPLIMIT, &on,
- sizeof(on)) < 0)
- err(1, "setsockopt(IPV6_HOPLIMIT)");
-#endif
seq = 0;
