Make sure to not decrease packet size when running with -v.

OK benno

diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index f868135..e478d9d 100644 (file)
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ping6.c,v 1.148 2016/08/30 12:10:10 florian Exp $     */
+/*     $OpenBSD: ping6.c,v 1.149 2016/08/30 13:50:13 florian Exp $     */
 /*     $KAME: ping6.c,v 1.163 2002/10/25 02:19:06 itojun Exp $ */
 
 /*
@@ -443,7 +443,7 @@ main(int argc, char *argv[])
        } else
                timing = 0;
        /* in F_VERBOSE case, we may get non-echoreply packets*/
-       if (options & F_VERBOSE)
+       if (options & F_VERBOSE && datalen < 2048)
                packlen = 2048 + IP6LEN + ICMP6ECHOLEN + EXTRA; /* XXX 2048? */
        else
                packlen = datalen + IP6LEN + ICMP6ECHOLEN + EXTRA;