From owner-svn-src-head@freebsd.org  Sat Sep 30 12:30:07 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0AD3BE271BA;
 Sat, 30 Sep 2017 12:30:07 +0000 (UTC)
 (envelope-from tuexen@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CDECE6EE99;
 Sat, 30 Sep 2017 12:30:06 +0000 (UTC)
 (envelope-from tuexen@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8UCU5lv035029;
 Sat, 30 Sep 2017 12:30:05 GMT (envelope-from tuexen@FreeBSD.org)
Received: (from tuexen@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8UCU5H6035028;
 Sat, 30 Sep 2017 12:30:05 GMT (envelope-from tuexen@FreeBSD.org)
Message-Id: <201709301230.v8UCU5H6035028@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tuexen set sender to
 tuexen@FreeBSD.org using -f
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Sat, 30 Sep 2017 12:30:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324122 - head/usr.sbin/traceroute6
X-SVN-Group: head
X-SVN-Commit-Author: tuexen
X-SVN-Commit-Paths: head/usr.sbin/traceroute6
X-SVN-Commit-Revision: 324122
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Sep 2017 12:30:07 -0000

Author: tuexen
Date: Sat Sep 30 12:30:05 2017
New Revision: 324122
URL: https://svnweb.freebsd.org/changeset/base/324122

Log:
  Fix reporting of probing size. This bug was introduced in r324119.
  
  MFC after:	4 weeks

Modified:
  head/usr.sbin/traceroute6/traceroute6.c

Modified: head/usr.sbin/traceroute6/traceroute6.c
==============================================================================
--- head/usr.sbin/traceroute6/traceroute6.c	Sat Sep 30 12:06:21 2017	(r324121)
+++ head/usr.sbin/traceroute6/traceroute6.c	Sat Sep 30 12:30:05 2017	(r324122)
@@ -904,7 +904,8 @@ main(int argc, char *argv[])
 	if (source)
 		fprintf(stderr, " from %s", source);
 	fprintf(stderr, ", %lu hops max, %lu byte packets\n",
-	    max_hops, datalen);
+	    max_hops,
+	    datalen + ((useproto == IPPROTO_UDP) ? sizeof(struct udphdr) : 0));
 	(void) fflush(stderr);
 
 	if (first_hop > 1)