diff options
| author |   dlg <dlg@openbsd.org> | 2018-11-10 05:03:23 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2018-11-10 05:03:23 +0000 |
| commit | 73ce99fb33cdab213019b4b2ada628f6cc0283f0 (patch) | |
| tree | bf7a979f5991d3cb5838426f8f89abec3c8eeaf7 /usr.sbin/traceroute | |
| parent | Clean up and free objects at the completion of the regress test. (diff) | |
| download | wireguard-openbsd-73ce99fb33cdab213019b4b2ada628f6cc0283f0.tar.xz wireguard-openbsd-73ce99fb33cdab213019b4b2ada628f6cc0283f0.zip | |
add support for setting the traffic class on ipv6 packets.
it reuses the toskeyword handling that ipv4 uses for setting the
tos field, which is equiavlent to traffic class.
ok florian@ denis@
Diffstat (limited to 'usr.sbin/traceroute')
| -rw-r--r-- | usr.sbin/traceroute/traceroute.8 | 6 | ||||
| -rw-r--r-- | usr.sbin/traceroute/traceroute.c | 18 |
2 files changed, 15 insertions, 9 deletions
diff --git a/usr.sbin/traceroute/traceroute.8 b/usr.sbin/traceroute/traceroute.8 index 4422a2d7c0a..835d0e28c4c 100644 --- a/usr.sbin/traceroute/traceroute.8 +++ b/usr.sbin/traceroute/traceroute.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: traceroute.8,v 1.66 2016/10/21 09:26:36 jmc Exp $ +.\" $OpenBSD: traceroute.8,v 1.67 2018/11/10 05:03:23 dlg Exp $ .\" $NetBSD: traceroute.8,v 1.6 1995/10/12 03:05:50 mycroft Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 @@ -33,7 +33,7 @@ .\" .\" @(#)traceroute.8 8.1 (Berkeley) 6/6/93 .\" -.Dd $Mdocdate: October 21 2016 $ +.Dd $Mdocdate: November 10 2018 $ .Dt TRACEROUTE 8 .Os .Sh NAME @@ -62,6 +62,7 @@ .Op Fl p Ar port .Op Fl q Ar nqueries .Op Fl s Ar src_addr +.Op Fl t Ar toskeyword .Op Fl V Ar rtable .Op Fl w Ar waittime .Ar host @@ -196,7 +197,6 @@ Useful values are probably .Cm lowdelay and .Cm throughput . -This option is not available for IPv6. .It Fl V Ar rtable Set the routing table to be used. .It Fl v diff --git a/usr.sbin/traceroute/traceroute.c b/usr.sbin/traceroute/traceroute.c index cd02cd9afa0..02fb48dfb5d 100644 --- a/usr.sbin/traceroute/traceroute.c +++ b/usr.sbin/traceroute/traceroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: traceroute.c,v 1.157 2018/10/20 19:55:01 kn Exp $ */ +/* $OpenBSD: traceroute.c,v 1.158 2018/11/10 05:03:23 dlg Exp $ */ /* $NetBSD: traceroute.c,v 1.10 1995/05/21 15:50:45 mycroft Exp $ */ /* @@ -414,7 +414,7 @@ main(int argc, char *argv[]) err(1, "sysctl"); conf->max_ttl = i; - while ((ch = getopt(argc, argv, v6flag ? "AcDdf:Ilm:np:q:Ss:w:vV:" : + while ((ch = getopt(argc, argv, v6flag ? "AcDdf:Ilm:np:q:Ss:t:w:vV:" : "AcDdf:g:Ilm:nP:p:q:Ss:t:V:vw:x")) != -1) switch (ch) { case 'A': @@ -802,6 +802,12 @@ main(int argc, char *argv[]) 0) err(1, "bind sndsock"); + if (conf->tflag) { + if (setsockopt(sndsock, IPPROTO_IPV6, IPV6_TCLASS, + &conf->tos, sizeof(conf->tos)) < 0) + err(6, "IPV6_TCLASS"); + } + len = sizeof(from6); if (getsockname(sndsock, (struct sockaddr *)&from6, &len) < 0) err(1, "getsockname"); @@ -943,10 +949,10 @@ void usage(int v6flag) { if (v6flag) { - fprintf(stderr, "usage: traceroute6 [-AcDdIlnSv] [-f first_hop] " - "[-m max_hop] [-p port]\n" - "\t[-q nqueries] [-s src_addr] [-V rtable] [-w waittime] " - "host\n\t[datalen]\n"); + fprintf(stderr, "usage: %s " + "[-AcDdIlnSv] [-f first_hop] [-m max_hop] [-p port]\n" + "\t[-q nqueries] [-s src_addr] [-t toskeyword] [-V rtable] " + "[-w waittime]\n\thost [datalen]\n", __progname); } else { fprintf(stderr, "usage: %s [-AcDdIlnSvx] [-f first_ttl] [-g gateway_addr] " |