From b2428973aa103ef5cd523c8696deab67ff53c76c Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 3 Oct 2005 16:07:30 -0700 Subject: [PATCH] --- yaml --- r: 9577 b: refs/heads/master c: 7ce312467edc270fcbd8a699efabb37ce1802b98 h: refs/heads/master i: 9575: 61c72fe1de6de3bea900c9dc55de2b601e2ddf11 v: v3 --- [refs] | 2 +- trunk/Documentation/networking/ip-sysctl.txt | 10 +++++++--- trunk/net/ipv4/icmp.c | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f65b650ff5b0..60f3662554d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e56a40bb36f1f73b4eac2ffe267c5357811e321 +refs/heads/master: 7ce312467edc270fcbd8a699efabb37ce1802b98 diff --git a/trunk/Documentation/networking/ip-sysctl.txt b/trunk/Documentation/networking/ip-sysctl.txt index ab65714d95fc..b433c8a27e2d 100644 --- a/trunk/Documentation/networking/ip-sysctl.txt +++ b/trunk/Documentation/networking/ip-sysctl.txt @@ -355,10 +355,14 @@ ip_dynaddr - BOOLEAN Default: 0 icmp_echo_ignore_all - BOOLEAN + If set non-zero, then the kernel will ignore all ICMP ECHO + requests sent to it. + Default: 0 + icmp_echo_ignore_broadcasts - BOOLEAN - If either is set to true, then the kernel will ignore either all - ICMP ECHO requests sent to it or just those to broadcast/multicast - addresses, respectively. + If set non-zero, then the kernel will ignore all ICMP ECHO and + TIMESTAMP requests sent to it via broadcast/multicast. + Default: 1 icmp_ratelimit - INTEGER Limit the maximal rates for sending ICMP packets whose type matches diff --git a/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c index 24eb56ae1b5a..90dca711ac9f 100644 --- a/trunk/net/ipv4/icmp.c +++ b/trunk/net/ipv4/icmp.c @@ -188,7 +188,7 @@ struct icmp_err icmp_err_convert[] = { /* Control parameters for ECHO replies. */ int sysctl_icmp_echo_ignore_all; -int sysctl_icmp_echo_ignore_broadcasts; +int sysctl_icmp_echo_ignore_broadcasts = 1; /* Control parameter - ignore bogus broadcast responses? */ int sysctl_icmp_ignore_bogus_error_responses;