aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavem <davem>2001-12-13 09:00:18 +0000
committerdavem <davem>2001-12-13 09:00:18 +0000
commit83e53f8f9d1edf52b48412b6bd48b709df81b66f (patch)
tree00127c74534a7c9e29ea6bdcde45c181e62f0d1c
parente0e16db2ec7592cb1b9ed17a19f386ec87379863 (diff)
downloadnetdev-vger-cvs-83e53f8f9d1edf52b48412b6bd48b709df81b66f.tar.gz
Fix icmp docs in mainline too.
-rw-r--r--Documentation/networking/ip-sysctl.txt21
-rw-r--r--net/ipv4/icmp.c6
2 files changed, 17 insertions, 10 deletions
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 9a0b7842c..4b412c0d9 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -309,13 +309,20 @@ icmp_echo_ignore_broadcasts - BOOLEAN
ICMP ECHO requests sent to it or just those to broadcast/multicast
addresses, respectively.
-icmp_destunreach_rate - INTEGER
-icmp_paramprob_rate - INTEGER
-icmp_timeexceed_rate - INTEGER
-icmp_echoreply_rate - INTEGER (not enabled per default)
- Limit the maximal rates for sending ICMP packets to specific targets.
+icmp_ratelimit - INTEGER
+ Limit the maximal rates for sending ICMP packets whose type matches
+ icmp_ratemask (see below) to specific targets.
0 to disable any limiting, otherwise the maximal rate in jiffies(1)
- See the source for more information.
+ Default: 1
+
+icmp_ratemask - INTEGER
+ Mask made of ICMP types for which rates are being limited.
+ Default: 6168
+ Note: 6168 = 0x1818 = 1<<ICMP_DEST_UNREACH + 1<<ICMP_SOURCE_QUENCH +
+ 1<<ICMP_TIME_EXCEEDED + 1<<ICMP_PARAMETERPROB, which means
+ dest unreachable (3), source quench (4), time exceeded (11)
+ and parameter problem (12) ICMP packets are rate limited
+ (check values in icmp.h)
icmp_ignore_bogus_error_responses - BOOLEAN
Some routers violate RFC 1122 by sending bogus responses to broadcast
@@ -511,4 +518,4 @@ IPv6 Update by:
Pekka Savola
pekkas@netcore.fi
-$Id: ip-sysctl.txt,v 1.19 2001-05-16 17:11:04 davem Exp $
+$Id: ip-sysctl.txt,v 1.20 2001-12-13 09:00:18 davem Exp $
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 351de2bd9..9b4696de8 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -3,7 +3,7 @@
*
* Alan Cox, <alan@redhat.com>
*
- * Version: $Id: icmp.c,v 1.82 2001-11-01 23:44:31 davem Exp $
+ * Version: $Id: icmp.c,v 1.83 2001-12-13 09:00:19 davem Exp $
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -154,8 +154,8 @@ int sysctl_icmp_ignore_bogus_error_responses;
* it's bit position.
*
* default:
- * dest unreachable (0x03), source quench (0x04),
- * time exceeded (0x11), parameter problem (0x12)
+ * dest unreachable (3), source quench (4),
+ * time exceeded (11), parameter problem (12)
*/
int sysctl_icmp_ratelimit = 1*HZ;