From owner-cvs-all  Sun Sep 20 13:46:16 1998
Return-Path: <owner-cvs-all>
Received: (from daemon@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id NAA03829
          for cvs-all-outgoing; Sun, 20 Sep 1998 13:46:16 -0700 (PDT)
          (envelope-from owner-cvs-all)
Received: from verdi.nethelp.no (verdi.nethelp.no [158.36.41.162])
          by hub.freebsd.org (8.8.8/8.8.8) with SMTP id NAA03644
          for <cvs-committers@FreeBSD.ORG>; Sun, 20 Sep 1998 13:45:53 -0700 (PDT)
          (envelope-from sthaug@nethelp.no)
From: sthaug@nethelp.no
Received: (qmail 21402 invoked by uid 1001); 20 Sep 1998 20:45:19 +0000 (GMT)
To: garbanzo@hooked.net
Cc: fenner@parc.xerox.com, jkoshy@FreeBSD.ORG, cvs-committers@FreeBSD.ORG
Subject: Re: cvs commit: src/etc rc.network rc.conf src/sys/netinetip_icmp.c src/lib/libc/gen sysctl.3 
In-Reply-To: Your message of "Sun, 20 Sep 1998 11:13:58 -0700 (PDT)"
References: <Pine.BSF.4.00.9809201112370.1461-100000@zippy.dyn.ml.org>
X-Mailer: Mew version 1.05+ on Emacs 19.34.2
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Date: Sun, 20 Sep 1998 22:45:18 +0200
Message-ID: <21400.906324318@verdi.nethelp.no>
Sender: owner-cvs-all@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

> Hey, I know this is just a nitpick, but could you perhaps add descriptions
> to the sysctls instead of using "".  A way to retrieve these descriptions
> might be dragged out of me in the near future, and besides they make good
> comments.  Thanks.

Happy to do so. Modified patch below.

Steinar Haug, Nethelp consulting, sthaug@nethelp.no
----------------------------------------------------------------------
*** ip_icmp.c.orig	Tue Sep 15 12:49:03 1998
--- ip_icmp.c	Sun Sep 20 22:40:14 1998
***************
*** 69,77 ****
  SYSCTL_INT(_net_inet_icmp, ICMPCTL_MASKREPL, maskrepl, CTLFLAG_RW,
  	&icmpmaskrepl, 0, "");
  
! static int	icmpbmcastecho = 0;
! SYSCTL_INT(_net_inet_icmp, OID_AUTO, bmcastecho, CTLFLAG_RW, &icmpbmcastecho,
! 	   0, "");
  
  #ifdef ICMPPRINTFS
  int	icmpprintfs = 0;
--- 69,85 ----
  SYSCTL_INT(_net_inet_icmp, ICMPCTL_MASKREPL, maskrepl, CTLFLAG_RW,
  	&icmpmaskrepl, 0, "");
  
! static int	icmpbcastecho = 0;
! SYSCTL_INT(_net_inet_icmp, OID_AUTO, bcastecho, CTLFLAG_RW, &icmpbcastecho,
! 	   0, "Reply to IP broadcast address ICMP echo request");
! 
! static int	icmpmcastecho = 1;
! SYSCTL_INT(_net_inet_icmp, OID_AUTO, mcastecho, CTLFLAG_RW, &icmpmcastecho,
! 	   0, "Reply to IP multicast address ICMP echo request");
! 
! static int	icmptstampreply = 0;
! SYSCTL_INT(_net_inet_icmp, OID_AUTO, tstampreply, CTLFLAG_RW, &icmptstampreply,
! 	   0, "Reply to ICMP timestamp request");
  
  #ifdef ICMPPRINTFS
  int	icmpprintfs = 0;
***************
*** 374,381 ****
  		break;
  
  	case ICMP_ECHO:
! 		if (!icmpbmcastecho
! 		    && (m->m_flags & (M_MCAST | M_BCAST)) != 0) {
  			icmpstat.icps_bmcastecho++;
  			break;
  		}
--- 382,394 ----
  		break;
  
  	case ICMP_ECHO:
! 		if (!icmpbcastecho
! 		    && (m->m_flags & M_BCAST) != 0) {
! 			icmpstat.icps_bmcastecho++;
! 			break;
! 		}
! 		if (!icmpmcastecho
! 		    && (m->m_flags & M_MCAST) != 0) {
  			icmpstat.icps_bmcastecho++;
  			break;
  		}
***************
*** 383,393 ****
  		goto reflect;
  
  	case ICMP_TSTAMP:
! 		if (!icmpbmcastecho
! 		    && (m->m_flags & (M_MCAST | M_BCAST)) != 0) {
! 			icmpstat.icps_bmcasttstamp++;
  			break;
- 		}
  		if (icmplen < ICMP_TSLEN) {
  			icmpstat.icps_badlen++;
  			break;
--- 396,403 ----
  		goto reflect;
  
  	case ICMP_TSTAMP:
! 		if (!icmptstampreply)
  			break;
  		if (icmplen < ICMP_TSLEN) {
  			icmpstat.icps_badlen++;
  			break;