Page MenuHomeFreeBSD

D61606.1794885828.diff
No OneTemporary

Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None

D61606.1794885828.diff

diff --git a/usr.sbin/traceroute/traceroute.8 b/usr.sbin/traceroute/traceroute.8
--- a/usr.sbin/traceroute/traceroute.8
+++ b/usr.sbin/traceroute/traceroute.8
@@ -18,7 +18,7 @@
.\"
.\" $Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $
.\"
-.Dd May 14, 2025
+.Dd November 15, 2026
.Dt TRACEROUTE 8
.Os
.Sh NAME
@@ -91,6 +91,9 @@
them, or if it is experiencing congestion
.Pq Dv 11 .
Otherwise, report that it passed the bits appropriately.
+The report is taken from the probe header quoted in the ICMP error message
+sent by the hop, so there is none for a destination which answers an ICMP
+probe with an echo reply.
If
.Fl t
is also specified, the corresponding ECN bits will be replaced.
diff --git a/usr.sbin/traceroute/traceroute.c b/usr.sbin/traceroute/traceroute.c
--- a/usr.sbin/traceroute/traceroute.c
+++ b/usr.sbin/traceroute/traceroute.c
@@ -1058,7 +1058,7 @@
#endif
precis = 3;
Printf(" %.*f ms", precis, T);
- if (ecnflag) {
+ if (ecnflag && hip != NULL) {
u_char ecn = hip->ip_tos & IPTOS_ECN_MASK;
switch (ecn) {
case IPTOS_ECN_ECT1:
@@ -1374,6 +1374,9 @@
#endif
type = icp->icmp_type;
code = icp->icmp_code;
+ /* Forget the header quoted by the previous packet. */
+ hip = NULL;
+ hiplen = 0;
/* Path MTU Discovery (RFC1191) */
if (code != ICMP_UNREACH_NEEDFRAG)
pmtu = 0;

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 17, 3:23 AM (22 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41792157
Default Alt Text
D61606.1794885828.diff (1 KB)

Event Timeline