[src/netbsd-1-5]: src/sys/netinet Pull up revision 1.144 (requested by martin):

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

details:   https://anonhg.NetBSD.org/src/rev/fd8b4b5e3de3
branches:  netbsd-1-5
changeset: 492877:fd8b4b5e3de3
user:      he <he%NetBSD.org@localhost>
date:      Tue Feb 26 20:57:03 2002 +0000

description:
Pull up revision 1.144 (requested by martin):
  Clear M_BCAST and M_MCAST on encapsulated packets on outgoing
  mbufs.  Also do not copy TTL from the inner packet, and make the
  outer TTL sysctl'able.  Fixes PR#14269, and makes traceroute work
  over GRE tunnels.

diffstat:

 sys/netinet/ip_input.c |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r 60a187abd58f -r fd8b4b5e3de3 sys/netinet/ip_input.c
--- a/sys/netinet/ip_input.c    Tue Feb 26 20:39:51 2002 +0000
+++ b/sys/netinet/ip_input.c    Tue Feb 26 20:57:03 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_input.c,v 1.114.4.6 2001/04/24 22:21:20 he Exp $    */
+/*     $NetBSD: ip_input.c,v 1.114.4.7 2002/02/26 20:57:03 he Exp $    */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -138,6 +138,8 @@
 /* just for gif_ttl */
 #include <netinet/in_gif.h>
 #include "gif.h"
+#include <net/if_gre.h>
+#include "gre.h"
 
 #ifdef MROUTING
 #include <netinet/ip_mroute.h>
@@ -1770,6 +1772,12 @@
                                  &ip_gif_ttl));
 #endif
 
+#if NGRE > 0
+       case IPCTL_GRE_TTL:
+               return(sysctl_int(oldp, oldlenp, newp, newlen,
+                                 &ip_gre_ttl));
+#endif
+
 #ifndef IPNOPRIVPORTS
        case IPCTL_LOWPORTMIN:
                old = lowportmin;