extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-04-02 20:06:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Small optimization in "logmartians" fix. Update manpage to reflect new implementation

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9786 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2009-04-03 14:31:21 +00:00
parent 8a9af0acf5
commit 54620a962e
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Shorewall/Perl/Shorewall/Proc.pm
View File

@ -146,8 +146,9 @@ sub setup_martian_logging() {
emit ( 'for file in /proc/sys/net/ipv4/conf/*; do', emit ( 'for file in /proc/sys/net/ipv4/conf/*; do',
" [ -f \$file/log_martians ] && echo $val > \$file/log_martians", " [ -f \$file/log_martians ] && echo $val > \$file/log_martians",
'done', 'done',
'' , '' );
'echo 0 > /proc/sys/net/ipv4/conf/all/log_martians' );
emit( 'echo 0 > /proc/sys/net/ipv4/conf/all/log_martians','' ) if $val == 1;
} }
for my $interface ( @$interfaces ) { for my $interface ( @$interfaces ) {
@ -170,14 +171,12 @@ sub setup_martian_logging() {
sub setup_source_routing( $ ) { sub setup_source_routing( $ ) {
my $family = shift; my $family = shift;
save_progress_message 'Setting up Accept Source Routing...';
my $interfaces = find_interfaces_by_option 'sourceroute'; my $interfaces = find_interfaces_by_option 'sourceroute';
if ( @$interfaces ) { if ( @$interfaces ) {
progress_message2 "$doing Accept Source Routing..."; progress_message2 "$doing Accept Source Routing...";
save_progress_message 'Setting up Source Routing...'; save_progress_message 'Setting up Accept Source Routing...';
for my $interface ( @$interfaces ) { for my $interface ( @$interfaces ) {
my $file = "/proc/sys/net/ipv$family/conf/$interface/accept_source_route"; my $file = "/proc/sys/net/ipv$family/conf/$interface/accept_source_route";

14
manpages/shorewall.conf.xml
View File

@ -769,20 +769,18 @@ net all DROP info</programlisting>then the chain name is 'net2all'
<listitem> <listitem>
<para>If set to <emphasis role="bold">Yes</emphasis> or <emphasis <para>If set to <emphasis role="bold">Yes</emphasis> or <emphasis
role="bold">yes</emphasis>, sets role="bold">yes</emphasis>, sets
/proc/sys/net/ipv4/conf/all/log_martians and <filename>/proc/sys/net/ipv4/conf/*/log_martians</filename> to 1
/proc/sys/net/ipv4/conf/default/log_martians to 1. In Shorewall with the exception of
versions prior to 4.1.5, the default is <emphasis <filename>/proc/sys/net/ipv4/conf/all/log_martians which is set to
role="bold">No</emphasis> which sets both of the above to zero. In 0</filename>. The default value is <emphasis
Shorewall 4.1.5, the default value was chaned to <emphasis
role="bold">Yes</emphasis> which sets both of the above to one. If role="bold">Yes</emphasis> which sets both of the above to one. If
you do not enable martian logging for all interfaces, you may still you do not enable martian logging for all interfaces, you may still
enable it for individual interfaces using the <emphasis enable it for individual interfaces using the <emphasis
role="bold">logmartians</emphasis> interface option in <ulink role="bold">logmartians</emphasis> interface option in <ulink
url="shorewall-interfaces.html">shorewall-interfaces</ulink>(5).</para> url="shorewall-interfaces.html">shorewall-interfaces</ulink>(5).</para>
<para>The value <emphasis role="bold">Keep</emphasis> is only <para>The value <emphasis role="bold">Keep</emphasis> causes
allowed under Shorewall-perl. It causes Shorewall to ignore the Shorewall to ignore the option. If the option is set to <emphasis
option. If the option is set to <emphasis
role="bold">Yes</emphasis>, then martians are logged on all role="bold">Yes</emphasis>, then martians are logged on all
interfaces. If the option is set to <emphasis interfaces. If the option is set to <emphasis
role="bold">No</emphasis>, then martian logging is disabled on all role="bold">No</emphasis>, then martian logging is disabled on all