[src/netbsd-1-4]: src/usr.sbin/traceroute pullup 1.30->1.31, 1.32->1.33 (is)

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2f68bfe99ae5
branches:  netbsd-1-4
changeset: 468933:2f68bfe99ae5
user:      perry <perry%NetBSD.org@localhost>
date:      Wed Jun 23 15:12:30 1999 +0000

description:
pullup 1.30->1.31, 1.32->1.33 (is)

diffstat:

 usr.sbin/traceroute/traceroute.c |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (54 lines):

diff -r a5025ef7f99c -r 2f68bfe99ae5 usr.sbin/traceroute/traceroute.c
--- a/usr.sbin/traceroute/traceroute.c  Wed Jun 23 15:08:34 1999 +0000
+++ b/usr.sbin/traceroute/traceroute.c  Wed Jun 23 15:12:30 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: traceroute.c,v 1.30 1999/02/17 07:17:28 christos Exp $ */
+/*     $NetBSD: traceroute.c,v 1.30.2.1 1999/06/23 15:12:30 perry Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1991, 1994, 1995, 1996, 1997
@@ -29,7 +29,7 @@
 #else
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1991, 1994, 1995, 1996, 1997\n\
 The Regents of the University of California.  All rights reserved.\n");
-__RCSID("$NetBSD: traceroute.c,v 1.30 1999/02/17 07:17:28 christos Exp $");
+__RCSID("$NetBSD: traceroute.c,v 1.30.2.1 1999/06/23 15:12:30 perry Exp $");
 #endif
 #endif
 
@@ -1101,6 +1101,8 @@
 
                        if (errno == EMSGSIZE) {
                                packlen = *mtuptr++;
+               outudp->uh_ulen =
+                   htons((u_short)(packlen - (sizeof(*outip) + optlen)));
 #ifdef _NoLongerLooksUgly_
                                Printf("\nmessage too big, "
                                    "trying new MTU = %d ", packlen);
@@ -1181,7 +1183,7 @@
                hip = &icp->icmp_ip;
                hlen = hip->ip_hl << 2;
 
-               nextmtu = icp->icmp_nextmtu;    /* for frag_err() */
+               nextmtu = htons(icp->icmp_nextmtu);     /* for frag_err() */
                        
                if (useicmp) {
                        /* XXX */
@@ -1481,6 +1483,8 @@
 ",
                         nextmtu);
                 packlen = nextmtu;
+               outudp->uh_ulen =
+                   htons((u_short)(packlen - (sizeof(*outip) + optlen)));
                 for (i = 0; mtus[i] > 0; i++) {
                         if (mtus[i] < nextmtu) {
                                 mtuptr = &mtus[i];    /* next one to try */
@@ -1489,6 +1493,8 @@
                 }
         } else {
                 packlen = *mtuptr++;
+               outudp->uh_ulen =
+                   htons((u_short)(packlen - (sizeof(*outip) + optlen)));
                 Printf("fragmentation required and DF set, "
                    "trying new MTU = %d ", packlen);
         }